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 2187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2198 { | 2198 { |
2199 TRACE_EVENT0("webkit", "WebFrameImpl::createFrameView"); | 2199 TRACE_EVENT0("webkit", "WebFrameImpl::createFrameView"); |
2200 | 2200 |
2201 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper
ly. | 2201 ASSERT(frame()); // If frame() doesn't exist, we probably didn't init proper
ly. |
2202 | 2202 |
2203 WebViewImpl* webView = viewImpl(); | 2203 WebViewImpl* webView = viewImpl(); |
2204 bool isMainFrame = webView->mainFrameImpl()->frame() == frame(); | 2204 bool isMainFrame = webView->mainFrameImpl()->frame() == frame(); |
2205 if (isMainFrame) | 2205 if (isMainFrame) |
2206 webView->suppressInvalidations(true); | 2206 webView->suppressInvalidations(true); |
2207 | 2207 |
2208 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView
->isTransparent(), webView->fixedLayoutSize(), isMainFrame ? webView->isFixedLay
outModeEnabled() : 0); | 2208 frame()->createView(webView->size(), webView->baseBackgroundColor(), webView
->isTransparent()); |
2209 if (webView->shouldAutoResize() && isMainFrame) | 2209 if (webView->shouldAutoResize() && isMainFrame) |
2210 frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie
w->maxAutoSize()); | 2210 frame()->view()->enableAutoSizeMode(true, webView->minAutoSize(), webVie
w->maxAutoSize()); |
2211 | 2211 |
2212 if (isMainFrame) | 2212 if (isMainFrame) |
2213 webView->suppressInvalidations(false); | 2213 webView->suppressInvalidations(false); |
2214 | 2214 |
2215 if (isMainFrame && webView->devToolsAgentPrivate()) | 2215 if (isMainFrame && webView->devToolsAgentPrivate()) |
2216 webView->devToolsAgentPrivate()->mainFrameViewCreated(this); | 2216 webView->devToolsAgentPrivate()->mainFrameViewCreated(this); |
2217 } | 2217 } |
2218 | 2218 |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2478 | 2478 |
2479 // There is a possibility that the frame being detached was the only | 2479 // There is a possibility that the frame being detached was the only |
2480 // pending one. We need to make sure final replies can be sent. | 2480 // pending one. We need to make sure final replies can be sent. |
2481 flushCurrentScopingEffort(m_findRequestIdentifier); | 2481 flushCurrentScopingEffort(m_findRequestIdentifier); |
2482 | 2482 |
2483 cancelPendingScopingEffort(); | 2483 cancelPendingScopingEffort(); |
2484 } | 2484 } |
2485 } | 2485 } |
2486 | 2486 |
2487 } // namespace WebKit | 2487 } // namespace WebKit |
OLD | NEW |