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 2222 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2233 { | 2233 { |
2234 TRACE_EVENT0("webkit", "WebFrameImpl::createFrameView"); | 2234 TRACE_EVENT0("webkit", "WebFrameImpl::createFrameView"); |
2235 | 2235 |
2236 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper
ly. | 2236 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper
ly. |
2237 | 2237 |
2238 WebViewImpl* webView = viewImpl(); | 2238 WebViewImpl* webView = viewImpl(); |
2239 bool isMainFrame = webView->mainFrameImpl()->frame() == frame(); | 2239 bool isMainFrame = webView->mainFrameImpl()->frame() == frame(); |
2240 if (isMainFrame) | 2240 if (isMainFrame) |
2241 webView->suppressInvalidations(true); | 2241 webView->suppressInvalidations(true); |
2242 | 2242 |
2243 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView
->isTransparent(), webView->fixedLayoutSize(), isMainFrame ? webView->isFixedLay
outModeEnabled() : 0); | 2243 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView
->isTransparent()); |
2244 if (webView->shouldAutoResize() && isMainFrame) | 2244 if (webView->shouldAutoResize() && isMainFrame) |
2245 frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie
w->maxAutoSize()); | 2245 frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie
w->maxAutoSize()); |
2246 | 2246 |
2247 if (isMainFrame) | 2247 if (isMainFrame) |
2248 webView->suppressInvalidations(false); | 2248 webView->suppressInvalidations(false); |
2249 | 2249 |
2250 if (isMainFrame && webView->devToolsAgentPrivate()) | 2250 if (isMainFrame && webView->devToolsAgentPrivate()) |
2251 webView->devToolsAgentPrivate()->mainFrameViewCreated(this); | 2251 webView->devToolsAgentPrivate()->mainFrameViewCreated(this); |
2252 } | 2252 } |
2253 | 2253 |
(...skipping 260 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2514 | 2514 |
2515 // There is a possibility that the frame being detached was the only | 2515 // There is a possibility that the frame being detached was the only |
2516 // pending one. We need to make sure final replies can be sent. | 2516 // pending one. We need to make sure final replies can be sent. |
2517 flushCurrentScopingEffort(m_findRequestIdentifier); | 2517 flushCurrentScopingEffort(m_findRequestIdentifier); |
2518 | 2518 |
2519 cancelPendingScopingEffort(); | 2519 cancelPendingScopingEffort(); |
2520 } | 2520 } |
2521 } | 2521 } |
2522 | 2522 |
2523 } // namespace WebKit | 2523 } // namespace WebKit |
OLD | NEW |