Changeset 101838 in webkit
- Timestamp:
- Dec 2, 2011 11:21:19 AM (12 years ago)
- Location:
- trunk/Source/WebKit2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/WebKit2/ChangeLog
r101815 r101838 1 2011-12-02 Andy Estes <aestes@apple.com> 2 3 WebKit2: Freeze the state of the layer tree until frame load completion if incremental rendering is suppressed 4 https://bugs.webkit.org/show_bug.cgi?id=73641 5 6 Reviewed by Darin Adler. 7 8 * WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp: 9 (WebKit::WebFrameLoaderClient::dispatchDidFirstLayout): Do not 10 un-freeze the layer tree state if incremental rendering is suppressed. 11 * WebProcess/WebPage/DrawingArea.h: 12 (WebKit::DrawingArea::layerTreeStateIsFrozen): Add a getter for 13 m_layerTreeStateIsFrozen. 14 * WebProcess/WebPage/DrawingAreaImpl.h: 15 (WebKit::DrawingAreaImpl::layerTreeStateIsFrozen): Ditto. 16 * WebProcess/WebPage/ca/LayerTreeHostCA.cpp: 17 (WebKit::LayerTreeHostCA::initialize): WebFrameLoaderClient might have 18 tried to freeze the state of the layer tree before the layer tree host 19 was created. When creating the layer tree host, only schedule a layer 20 flush if the layer tree state isn't frozen. 21 1 22 2011-12-02 Nayan Kumar K <nayankk@motorola.com> 2 23 -
trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebFrameLoaderClient.cpp
r101609 r101838 65 65 #include <WebCore/ProgressTracker.h> 66 66 #include <WebCore/ResourceError.h> 67 #include <WebCore/Settings.h> 67 68 #include <WebCore/UIEventWithKeyState.h> 68 69 #include <WebCore/Widget.h> … … 533 534 webPage->send(Messages::WebPageProxy::DidFirstLayoutForFrame(m_frame->frameID(), InjectedBundleUserMessageEncoder(userData.get()))); 534 535 535 if (m_frame == m_frame->page()->mainWebFrame() )536 if (m_frame == m_frame->page()->mainWebFrame() && !webPage->corePage()->settings()->suppressIncrementalRendering()) 536 537 webPage->drawingArea()->setLayerTreeStateIsFrozen(false); 537 538 } -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingArea.h
r99615 r101838 70 70 virtual void forceRepaint() { } 71 71 virtual void setLayerTreeStateIsFrozen(bool) { } 72 virtual bool layerTreeStateIsFrozen() const { return false; } 72 73 73 74 virtual void didInstallPageOverlay() { } -
trunk/Source/WebKit2/WebProcess/WebPage/DrawingAreaImpl.h
r99465 r101838 55 55 virtual void scroll(const WebCore::IntRect& scrollRect, const WebCore::IntSize& scrollOffset); 56 56 virtual void setLayerTreeStateIsFrozen(bool); 57 virtual bool layerTreeStateIsFrozen() const { return m_layerTreeStateIsFrozen; } 57 58 virtual void forceRepaint(); 58 59 -
trunk/Source/WebKit2/WebProcess/WebPage/ca/LayerTreeHostCA.cpp
r93303 r101838 78 78 platformInitialize(m_layerTreeContext); 79 79 80 setLayerFlushSchedulingEnabled(!m_webPage->drawingArea()->layerTreeStateIsFrozen()); 80 81 scheduleLayerFlush(); 81 82 }
Note: See TracChangeset
for help on using the changeset viewer.