Changeset 94777 in webkit

Timestamp:

Sep 8, 2011 11:54:33 AM (13 years ago)

Author:

jchaffraix@webkit.org

Message:

Remove LayoutStateDisabler instances from RenderLayer
​https://bugs.webkit.org/show_bug.cgi?id=66896

Reviewed by Simon Fraser.

As part of r93614, scrollTo does not call updateLayerPositions anymore.
This means that we don't need to disable LayoutState from the scrolling code
in RenderLayer.

This change is covered by the existing tests.

• rendering/RenderLayer.cpp:

(WebCore::RenderLayer::updateLayerPositions): Updated the comment
that was not accurate anymore. Also explained what is wrong with
LayoutState vs RenderLayer now. Note that the ASSERT is still
valid and will not trigger as the remaining calls to updateLayerPositions
are done *outside* layout() where LayoutState is not set (thus disabled).

(WebCore::RenderLayer::updateScrollInfoAfterLayout): Removed
2 LayoutStateDisabler surrounding scrollToOffset.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-09-08  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Remove LayoutStateDisabler instances from RenderLayer
+        https://bugs.webkit.org/show_bug.cgi?id=66896
+
+        Reviewed by Simon Fraser.
+
+        As part of r93614, scrollTo does not call updateLayerPositions anymore.
+        This means that we don't need to disable LayoutState from the scrolling code
+        in RenderLayer.
+
+        This change is covered by the existing tests.
+
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::updateLayerPositions): Updated the comment
+        that was not accurate anymore. Also explained what is wrong with
+        LayoutState vs RenderLayer now. Note that the ASSERT is still
+        valid and will not trigger as the remaining calls to updateLayerPositions
+        are done *outside* layout() where LayoutState is not set (thus disabled).
+
+        (WebCore::RenderLayer::updateScrollInfoAfterLayout): Removed
+        2 LayoutStateDisabler surrounding scrollToOffset.
+
 2011-09-08  Julien Chaffraix  <jchaffraix@webkit.org>
 

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -335 +335 @@
         RenderView* view = renderer()->view();
         ASSERT(view);
-        // FIXME: Optimize using LayoutState and remove LayoutStateDisabler instantiation
-        // from updateScrollInfoAfterLayout().
+        // FIXME: LayoutState does not work with RenderLayers as there is not a 1-to-1
+        // mapping between them and the RenderObjects. It would be neat to enable
+        // LayoutState outside the layout() phase and use it here.
         ASSERT(!view->layoutStateEnabled());
 
@@ -2248 +2249 @@
         LayoutUnit newX = max<LayoutUnit>(0, min(scrollXOffset(), scrollWidth() - box->clientWidth()));
         LayoutUnit newY = max<LayoutUnit>(0, min(scrollYOffset(), scrollHeight() - box->clientHeight()));
-        if (newX != scrollXOffset() || newY != scrollYOffset()) {
-            RenderView* view = renderer()->view();
-            ASSERT(view);
-            // scrollToOffset() may call updateLayerPositions(), which doesn't work
-            // with LayoutState.
-            // FIXME: Remove the LayoutStateDisabler instantiation if the above changes.
-            LayoutStateDisabler layoutStateDisabler(view);
+        if (newX != scrollXOffset() || newY != scrollYOffset())
             scrollToOffset(newX, newY);
-        }
     }
 
@@ -2329 +2323 @@
     }
  
-    RenderView* view = renderer()->view();
-    {
-        LayoutStateDisabler layoutStateDisabler(view);
-        scrollToOffset(scrollXOffset(), scrollYOffset());
-    }
+    scrollToOffset(scrollXOffset(), scrollYOffset());
 
     if (renderer()->node() && renderer()->document()->hasListenerType(Document::OVERFLOWCHANGED_LISTENER))