Changeset 106121 in webkit

Timestamp:

Jan 27, 2012 7:35:40 AM (12 years ago)

Author:

noam.rosenthal@nokia.com

Message:

[Qt][WK2] Child layers appear in wrong position when scrolling
​https://bugs.webkit.org/show_bug.cgi?id=77063

Reviewed by Simon Fraser.

When using the delegatesScrolling mode in FrameView, the compositor doesn't need
to control the special clip/scroll layers. Also, when we change that mode, we need to let
the compositor reset its backing-stores and rebuild them without scrolling/clipping.

This is tested by compositing tests, when run with Qt in touch mode.

• page/FrameView.cpp:

(WebCore::FrameView::delegatesScrollingDidChange):
(WebCore):

• page/FrameView.h:

(FrameView):

• platform/ScrollView.cpp:

(WebCore::ScrollView::setDelegatesScrolling):

• platform/ScrollView.h:

(WebCore::ScrollView::delegatesScrollingDidChange):

• rendering/RenderLayerCompositor.cpp:

(WebCore::RenderLayerCompositor::requiresScrollLayer):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• page/FrameView.cpp (modified) (1 diff)
• page/FrameView.h (modified) (1 diff)
• platform/ScrollView.cpp (modified) (1 diff)
• platform/ScrollView.h (modified) (1 diff)
• rendering/RenderLayerCompositor.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-01-27  No'am Rosenthal  <noam.rosenthal@nokia.com>
+
+        [Qt][WK2] Child layers appear in wrong position when scrolling
+        https://bugs.webkit.org/show_bug.cgi?id=77063
+
+        Reviewed by Simon Fraser.
+
+        When using the delegatesScrolling mode in FrameView, the compositor doesn't need
+        to control the special clip/scroll layers. Also, when we change that mode, we need to let
+        the compositor reset its backing-stores and rebuild them without scrolling/clipping.
+
+        This is tested by compositing tests, when run with Qt in touch mode.
+
+        * page/FrameView.cpp:
+        (WebCore::FrameView::delegatesScrollingDidChange):
+        (WebCore):
+        * page/FrameView.h:
+        (FrameView):
+        * platform/ScrollView.cpp:
+        (WebCore::ScrollView::setDelegatesScrolling):
+        * platform/ScrollView.h:
+        (WebCore::ScrollView::delegatesScrollingDidChange):
+        * rendering/RenderLayerCompositor.cpp:
+        (WebCore::RenderLayerCompositor::requiresScrollLayer):
+
 2012-01-27  Thiago Marcos P. Santos  <tmpsantos@gmail.com>
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -1703 +1703 @@
 }
 
+void FrameView::delegatesScrollingDidChange()
+{
+#if USE(ACCELERATED_COMPOSITING)
+    // When we switch to delgatesScrolling mode, we should destroy the scrolling/clipping layers in RenderLayerCompositor.
+    clearBackingStores();
+#endif
+}
+
 void FrameView::setFixedVisibleContentRect(const IntRect& visibleContentRect)
 {

trunk/Source/WebCore/page/FrameView.h

@@ -347 +347 @@
     virtual void visibleContentsResized();
 
+    virtual void delegatesScrollingDidChange();
+
     // Override ScrollView methods to do point conversion via renderers, in order to
     // take transforms into account.

trunk/Source/WebCore/platform/ScrollView.cpp

@@ -220 +220 @@
 void ScrollView::setDelegatesScrolling(bool delegatesScrolling)
 {
+    if (m_delegatesScrolling == delegatesScrolling)
+        return;
+
     m_delegatesScrolling = delegatesScrolling;
+    delegatesScrollingDidChange();
 }
 

trunk/Source/WebCore/platform/ScrollView.h

@@ -302 +302 @@
 
     virtual void visibleContentsResized() = 0;
+    virtual void delegatesScrollingDidChange() { }
 
     IntRect fixedVisibleContentRect() const { return m_fixedVisibleContentRect; }

trunk/Source/WebCore/rendering/RenderLayerCompositor.cpp

@@ -1584 +1584 @@
 bool RenderLayerCompositor::requiresScrollLayer(RootLayerAttachment attachment) const
 {
+    // This applies when the application UI handles scrolling, in which case RenderLayerCompositor doesn't need to manage it.
+    if (m_renderView->frameView()->delegatesScrolling())
+        return false;
+
     // We need to handle our own scrolling if we're:
     return !m_renderView->frameView()->platformWidget() // viewless (i.e. non-Mac, or Mac in WebKit2)