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