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