Changeset 88183 in webkit

Timestamp:

Jun 6, 2011 12:57:36 PM (13 years ago)

Author:

eae@chromium.org

Message:

2011-06-06 Emil A Eklund <​eae@chromium.org>

Reviewed by Eric Seidel.

Convert RenderBox::clipRect to IntPoint
​https://bugs.webkit.org/show_bug.cgi?id=62045

Covered by existing tests.

• rendering/RenderBox.cpp: (WebCore::RenderBox::clipRect):
• rendering/RenderBox.h:
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::calculateClipRects): (WebCore::RenderLayer::calculateRects): (WebCore::RenderLayer::repaintBlockSelectionGaps):
• rendering/RenderLayerBacking.cpp: (WebCore::clipBox):

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-06  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Convert RenderBox::clipRect to IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62045
+
+        Covered by existing tests.
+
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::clipRect):
+        * rendering/RenderBox.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        (WebCore::RenderLayer::calculateRects):
+        (WebCore::RenderLayer::repaintBlockSelectionGaps):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::clipBox):
+
 2011-06-06  Peter Kasting  <pkasting@google.com>
 

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1150 +1150 @@
 }
 
-IntRect RenderBox::clipRect(int tx, int ty)
-{
-    int clipX = tx;
-    int clipY = ty;
-    int clipWidth = width();
-    int clipHeight = height();
-
+IntRect RenderBox::clipRect(const IntPoint& location)
+{
+    IntRect clipRect(location, size());
     if (!style()->clipLeft().isAuto()) {
         int c = style()->clipLeft().calcValue(width());
-        clipX += c;
-        clipWidth -= c;
+        clipRect.move(c, 0);
+        clipRect.contract(c, 0);
     }
 
     if (!style()->clipRight().isAuto())
-        clipWidth -= width() - style()->clipRight().calcValue(width());
+        clipRect.contract(width() - style()->clipRight().calcValue(width()), 0);
 
     if (!style()->clipTop().isAuto()) {
         int c = style()->clipTop().calcValue(height());
-        clipY += c;
-        clipHeight -= c;
+        clipRect.move(0, c);
+        clipRect.contract(0, c);
     }
 
     if (!style()->clipBottom().isAuto())
-        clipHeight -= height() - style()->clipBottom().calcValue(height());
-
-    return IntRect(clipX, clipY, clipWidth, clipHeight);
+        clipRect.contract(0, height() - style()->clipBottom().calcValue(height()));
+
+    return clipRect;
 }
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -347 +347 @@
 
     virtual IntRect overflowClipRect(const IntPoint& location, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize);
-    IntRect clipRect(int tx, int ty);
+    IntRect clipRect(const IntPoint& location);
     virtual bool hasControlClip() const { return false; }
     virtual IntRect controlClipRect(const IntPoint&) const { return IntRect(); }

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3380 +3380 @@
         }
         if (renderer()->hasClip()) {
-            IntRect newPosClip = toRenderBox(renderer())->clipRect(offset.x(), offset.y());
+            IntRect newPosClip = toRenderBox(renderer())->clipRect(offset);
             clipRects.setPosClipRect(intersection(newPosClip, clipRects.posClipRect()));
             clipRects.setOverflowClipRect(intersection(newPosClip, clipRects.overflowClipRect()));
@@ -3441 +3441 @@
         if (renderer()->hasClip()) {
             // Clip applies to *us* as well, so go ahead and update the damageRect.
-            IntRect newPosClip = toRenderBox(renderer())->clipRect(offset.x(), offset.y());
+            IntRect newPosClip = toRenderBox(renderer())->clipRect(offset);
             backgroundRect.intersect(newPosClip);
             foregroundRect.intersect(newPosClip);
@@ -3512 +3512 @@
         rect.intersect(toRenderBox(renderer())->overflowClipRect(IntPoint()));
     if (renderer()->hasClip())
-        rect.intersect(toRenderBox(renderer())->clipRect(0, 0));
+        rect.intersect(toRenderBox(renderer())->clipRect(IntPoint()));
     if (!rect.isEmpty())
         renderer()->repaintRectangle(rect);

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -320 +320 @@
 
     if (renderer->hasClip())
-        result.intersect(renderer->clipRect(0, 0));
+        result.intersect(renderer->clipRect(IntPoint()));
 
     return result;