Changeset 109157 in webkit

Timestamp:

Feb 28, 2012 3:09:06 PM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

Move RenderLayer::size() calls to a common function
​https://bugs.webkit.org/show_bug.cgi?id=76972

Reviewed by Simon Fraser.

Refactoring only.

This change introduces RenderBox::cachedSizeForOverflowClip() that handles all the cached size
requests that currently goes through the RenderLayer. This indirection helps to decouple the need
for a RenderLayer so that we can lazily allocate RenderLayers as part of bug 75568.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::cachedSizeForOverflowClip):
Added this function to handle the calls to RenderLayer's size(). Unfortunately a lot of the
code calls RenderLayer::size() directly so I could not make it private.

• rendering/LayoutState.cpp:

(WebCore::LayoutState::LayoutState):

• rendering/RenderBox.cpp:

(WebCore::RenderBox::computeRectForRepaint):

• rendering/RenderBox.h:

(RenderBox):

• rendering/RenderInline.cpp:

(WebCore::RenderInline::clippedOverflowRectForRepaint):
(WebCore::RenderInline::computeRectForRepaint):

• rendering/RenderObject.cpp:

(WebCore::RenderObject::computeRectForRepaint):
Fixed the call sites above.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/LayoutState.cpp (modified) (2 diffs)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderInline.cpp (modified) (2 diffs)
• rendering/RenderObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-28  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Move RenderLayer::size() calls to a common function
+        https://bugs.webkit.org/show_bug.cgi?id=76972
+
+        Reviewed by Simon Fraser.
+
+        Refactoring only.
+
+        This change introduces RenderBox::cachedSizeForOverflowClip() that handles all the cached size
+        requests that currently goes through the RenderLayer. This indirection helps to decouple the need
+        for a RenderLayer so that we can lazily allocate RenderLayers as part of bug 75568.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::cachedSizeForOverflowClip):
+        Added this function to handle the calls to RenderLayer's size(). Unfortunately a lot of the
+        code calls RenderLayer::size() directly so I could not make it private.
+
+        * rendering/LayoutState.cpp:
+        (WebCore::LayoutState::LayoutState):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::computeRectForRepaint):
+        * rendering/RenderBox.h:
+        (RenderBox):
+        * rendering/RenderInline.cpp:
+        (WebCore::RenderInline::clippedOverflowRectForRepaint):
+        (WebCore::RenderInline::computeRectForRepaint):
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::computeRectForRepaint):
+        Fixed the call sites above.
+
 2012-02-28  Tim Dresser  <tdresser@chromium.org>
 

trunk/Source/WebCore/rendering/LayoutState.cpp

@@ -71 +71 @@
 
     if (renderer->hasOverflowClip()) {
-        RenderLayer* layer = renderer->layer();
-        LayoutRect clipRect(toPoint(m_paintOffset) + renderer->view()->layoutDelta(), layer->size());
+        LayoutRect clipRect(toPoint(m_paintOffset) + renderer->view()->layoutDelta(), renderer->cachedSizeForOverflowClip());
         if (m_clipped)
             m_clipRect.intersect(clipRect);
@@ -157 +156 @@
 
     if (container->hasOverflowClip()) {
+        m_clipped = true;
         RenderBox* containerBox = toRenderBox(container);
-        RenderLayer* layer = containerBox->layer();
-        m_clipped = true;
-        m_clipRect = LayoutRect(toPoint(m_paintOffset), layer->size());
+        m_clipRect = LayoutRect(toPoint(m_paintOffset), containerBox->cachedSizeForOverflowClip());
         m_paintOffset -= containerBox->scrolledContentOffset();
     }

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -754 +754 @@
 }
 
+IntSize RenderBox::cachedSizeForOverflowClip() const
+{
+    ASSERT(hasOverflowClip());
+    ASSERT(hasLayer());
+
+    return layer()->size();
+}
+
 LayoutUnit RenderBox::minPreferredLogicalWidth() const
 {
@@ -1643 +1651 @@
 
         LayoutRect repaintRect(topLeft, rect.size());
-        LayoutRect boxRect(LayoutPoint(), containerBox->layer()->size());
+        LayoutRect boxRect(LayoutPoint(), containerBox->cachedSizeForOverflowClip());
         rect = intersection(repaintRect, boxRect);
         if (rect.isEmpty())

trunk/Source/WebCore/rendering/RenderBox.h

@@ -449 +449 @@
 
     IntSize scrolledContentOffset() const;
+    IntSize cachedSizeForOverflowClip() const;
 
     virtual bool hasRelativeDimensions() const;

trunk/Source/WebCore/rendering/RenderInline.cpp

@@ -1034 +1034 @@
         repaintRect.move(-cb->scrolledContentOffset()); // For overflow:auto/scroll/hidden.
 
-        LayoutRect boxRect(LayoutPoint(), cb->layer()->size());
+        LayoutRect boxRect(LayoutPoint(), cb->cachedSizeForOverflowClip());
         r = intersection(repaintRect, boxRect);
     }
@@ -1136 +1136 @@
 
         LayoutRect repaintRect(topLeft, rect.size());
-        LayoutRect boxRect(LayoutPoint(), containerBox->layer()->size());
+        LayoutRect boxRect(LayoutPoint(), containerBox->cachedSizeForOverflowClip());
         rect = intersection(repaintRect, boxRect);
         if (rect.isEmpty())

trunk/Source/WebCore/rendering/RenderObject.cpp

@@ -1521 +1521 @@
             repaintRect.move(-boxParent->scrolledContentOffset()); // For overflow:auto/scroll/hidden.
 
-            LayoutRect boxRect(LayoutPoint(), boxParent->layer()->size());
+            LayoutRect boxRect(LayoutPoint(), boxParent->cachedSizeForOverflowClip());
             rect = intersection(repaintRect, boxRect);
             if (rect.isEmpty())