OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 2223 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2234 { | 2234 { |
2235 TRACE_EVENT0("webkit", "WebFrameImpl::createFrameView"); | 2235 TRACE_EVENT0("webkit", "WebFrameImpl::createFrameView"); |
2236 | 2236 |
2237 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper
ly. | 2237 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper
ly. |
2238 | 2238 |
2239 WebViewImpl* webView = viewImpl(); | 2239 WebViewImpl* webView = viewImpl(); |
2240 bool isMainFrame = webView->mainFrameImpl()->frame() == frame(); | 2240 bool isMainFrame = webView->mainFrameImpl()->frame() == frame(); |
2241 if (isMainFrame) | 2241 if (isMainFrame) |
2242 webView->suppressInvalidations(true); | 2242 webView->suppressInvalidations(true); |
2243 | 2243 |
2244 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView
->isTransparent(), webView->fixedLayoutSize(), isMainFrame ? webView->isFixedLay
outModeEnabled() : 0); | 2244 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView
->isTransparent()); |
2245 if (webView->shouldAutoResize() && isMainFrame) | 2245 if (webView->shouldAutoResize() && isMainFrame) |
2246 frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie
w->maxAutoSize()); | 2246 frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie
w->maxAutoSize()); |
2247 | 2247 |
2248 if (isMainFrame) | 2248 if (isMainFrame) |
2249 webView->suppressInvalidations(false); | 2249 webView->suppressInvalidations(false); |
2250 | 2250 |
2251 if (isMainFrame && webView->devToolsAgentPrivate()) | 2251 if (isMainFrame && webView->devToolsAgentPrivate()) |
2252 webView->devToolsAgentPrivate()->mainFrameViewCreated(this); | 2252 webView->devToolsAgentPrivate()->mainFrameViewCreated(this); |
2253 } | 2253 } |
2254 | 2254 |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2515 | 2515 |
2516 // There is a possibility that the frame being detached was the only | 2516 // There is a possibility that the frame being detached was the only |
2517 // pending one. We need to make sure final replies can be sent. | 2517 // pending one. We need to make sure final replies can be sent. |
2518 flushCurrentScopingEffort(m_findRequestIdentifier); | 2518 flushCurrentScopingEffort(m_findRequestIdentifier); |
2519 | 2519 |
2520 cancelPendingScopingEffort(); | 2520 cancelPendingScopingEffort(); |
2521 } | 2521 } |
2522 } | 2522 } |
2523 | 2523 |
2524 } // namespace WebKit | 2524 } // namespace WebKit |
OLD | NEW |