Changeset 88102 in webkit

Timestamp:

Jun 4, 2011 2:53:36 AM (13 years ago)

Author:

eae@chromium.org

Message:

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

Reviewed by Eric Seidel.

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

Covered by existing tests.

• editing/Editor.cpp: (WebCore::Editor::insideVisibleArea):
• platform/graphics/IntRect.h: (WebCore::IntRect::contract):
• rendering/RenderBlock.cpp: (WebCore::RenderBlock::nodeAtPoint):
• rendering/RenderBox.cpp: (WebCore::RenderBox::pushContentsClip): (WebCore::RenderBox::overflowClipRect):
• rendering/RenderBox.h:
• rendering/RenderBoxModelObject.cpp: (WebCore::RenderBoxModelObject::paintFillLayerExtended):
• rendering/RenderLayer.cpp: (WebCore::RenderLayer::calculateClipRects): (WebCore::RenderLayer::calculateRects): (WebCore::RenderLayer::repaintBlockSelectionGaps):
• rendering/RenderLayerBacking.cpp: (WebCore::clipBox):
• rendering/RenderTable.cpp: (WebCore::RenderTable::overflowClipRect): (WebCore::RenderTable::nodeAtPoint):
• rendering/RenderTable.h:
• rendering/RenderTableSection.cpp: (WebCore::RenderTableSection::nodeAtPoint):
• rendering/svg/RenderSVGRoot.cpp: (WebCore::RenderSVGRoot::paint):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• editing/Editor.cpp (modified) (2 diffs)
• platform/graphics/IntRect.h (modified) (1 diff)
• rendering/RenderBlock.cpp (modified) (1 diff)
• rendering/RenderBox.cpp (modified) (2 diffs)
• rendering/RenderBox.h (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)
• rendering/RenderLayer.cpp (modified) (3 diffs)
• rendering/RenderLayerBacking.cpp (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (3 diffs)
• rendering/RenderTable.h (modified) (1 diff)
• rendering/RenderTableSection.cpp (modified) (1 diff)
• rendering/svg/RenderSVGRoot.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-04  Emil A Eklund  <eae@chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Convert RenderBox::overflowClipRect to IntPoint
+        https://bugs.webkit.org/show_bug.cgi?id=62032
+
+        Covered by existing tests.
+
+        * editing/Editor.cpp:
+        (WebCore::Editor::insideVisibleArea):
+        * platform/graphics/IntRect.h:
+        (WebCore::IntRect::contract):
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::nodeAtPoint):
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::pushContentsClip):
+        (WebCore::RenderBox::overflowClipRect):
+        * rendering/RenderBox.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintFillLayerExtended):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::calculateClipRects):
+        (WebCore::RenderLayer::calculateRects):
+        (WebCore::RenderLayer::repaintBlockSelectionGaps):
+        * rendering/RenderLayerBacking.cpp:
+        (WebCore::clipBox):
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::overflowClipRect):
+        (WebCore::RenderTable::nodeAtPoint):
+        * rendering/RenderTable.h:
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::nodeAtPoint):
+        * rendering/svg/RenderSVGRoot.cpp:
+        (WebCore::RenderSVGRoot::paint):
+
 2011-06-04  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebCore/editing/Editor.cpp

@@ -2569 +2569 @@
         return true;
 
-    IntRect rectInPageCoords = container->overflowClipRect(0, 0);
+    IntRect rectInPageCoords = container->overflowClipRect(IntPoint());
     IntRect rectInFrameCoords = IntRect(renderer->x() * -1, renderer->y() * -1,
                                     rectInPageCoords.width(), rectInPageCoords.height());
@@ -2598 +2598 @@
         return true;
 
-    IntRect rectInPageCoords = container->overflowClipRect(0, 0);
+    IntRect rectInPageCoords = container->overflowClipRect(IntPoint());
     IntRect rectInFrameCoords = IntRect(renderer->x() * -1, renderer->y() * -1,
                                     rectInPageCoords.width(), rectInPageCoords.height());

trunk/Source/WebCore/platform/graphics/IntRect.h

@@ -114 +114 @@
     void expand(const IntSize& size) { m_size += size; }
     void expand(int dw, int dh) { m_size.expand(dw, dh); }
+    void contract(const IntSize& size) { m_size -= size; }
+    void contract(int dw, int dh) { m_size.expand(-dw, -dh); }
 
     void shiftXEdgeTo(int edge)

trunk/Source/WebCore/rendering/RenderBlock.cpp

@@ -3924 +3924 @@
     bool useClip = (hasControlClip() || useOverflowClip);
     IntRect hitTestArea(result.rectForPoint(pointInContainer));
-    bool checkChildren = !useClip || (hasControlClip() ? controlClipRect(toPoint(localOffset)).intersects(hitTestArea) : overflowClipRect(localOffset.width(), localOffset.height(), IncludeOverlayScrollbarSize).intersects(hitTestArea));
+    bool checkChildren = !useClip || (hasControlClip() ? controlClipRect(toPoint(localOffset)).intersects(hitTestArea) : overflowClipRect(toPoint(localOffset), IncludeOverlayScrollbarSize).intersects(hitTestArea));
     if (checkChildren) {
         // Hit test descendants first.

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -1115 +1115 @@
         paintInfo.phase = PaintPhaseChildBlockBackgrounds;
     }
-    IntRect clipRect(isControlClip ? controlClipRect(IntPoint(tx, ty)) : overflowClipRect(tx, ty));
+    IntRect clipRect(isControlClip ? controlClipRect(IntPoint(tx, ty)) : overflowClipRect(IntPoint(tx, ty)));
     paintInfo.context->save();
     if (style()->hasBorderRadius())
@@ -1136 +1136 @@
 }
 
-IntRect RenderBox::overflowClipRect(int tx, int ty, OverlayScrollbarSizeRelevancy relevancy)
+IntRect RenderBox::overflowClipRect(const IntPoint& location, OverlayScrollbarSizeRelevancy relevancy)
 {
     // FIXME: When overflow-clip (CSS3) is implemented, we'll obtain the property
     // here.
-
-    int bLeft = borderLeft();
-    int bTop = borderTop();
-
-    int clipX = tx + bLeft;
-    int clipY = ty + bTop;
-    int clipWidth = width() - bLeft - borderRight();
-    int clipHeight = height() - bTop - borderBottom();
+    IntRect clipRect(location + IntSize(borderLeft(), borderTop()),
+        size() - IntSize(borderLeft() + borderRight(), borderTop() + borderBottom()));
 
     // Subtract out scrollbars if we have them.
-    if (layer()) {
-        clipWidth -= layer()->verticalScrollbarWidth(relevancy);
-        clipHeight -= layer()->horizontalScrollbarHeight(relevancy);
-    }
-
-    return IntRect(clipX, clipY, clipWidth, clipHeight);
+    if (layer())
+        clipRect.contract(layer()->verticalScrollbarWidth(relevancy), layer()->horizontalScrollbarHeight(relevancy));
+
+    return clipRect;
 }
 

trunk/Source/WebCore/rendering/RenderBox.h

@@ -346 +346 @@
     virtual IntRect localCaretRect(InlineBox*, int caretOffset, int* extraWidthToEndOfLine = 0);
 
-    virtual IntRect overflowClipRect(int tx, int ty, OverlayScrollbarSizeRelevancy relevancy = IgnoreOverlayScrollbarSize);
+    virtual IntRect overflowClipRect(const IntPoint& location, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize);
     IntRect clipRect(int tx, int ty);
     virtual bool hasControlClip() const { return false; }

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -656 +656 @@
     if (clippedWithLocalScrolling) {
         // Clip to the overflow area.
-        context->clip(toRenderBox(this)->overflowClipRect(rect.x(), rect.y()));
+        context->clip(toRenderBox(this)->overflowClipRect(rect.location()));
         
         // Adjust the paint rect to reflect a scrolled content box with borders at the ends.

trunk/Source/WebCore/rendering/RenderLayer.cpp

@@ -3375 +3375 @@
         
         if (renderer()->hasOverflowClip()) {
-            IntRect newOverflowClip = toRenderBox(renderer())->overflowClipRect(offset.x(), offset.y(), relevancy);
+            IntRect newOverflowClip = toRenderBox(renderer())->overflowClipRect(offset, relevancy);
             clipRects.setOverflowClipRect(intersection(newOverflowClip, clipRects.overflowClipRect()));
             if (renderer()->isPositioned() || renderer()->isRelPositioned())
@@ -3439 +3439 @@
         // This layer establishes a clip of some kind.
         if (renderer()->hasOverflowClip())
-            foregroundRect.intersect(toRenderBox(renderer())->overflowClipRect(offset.x(), offset.y(), relevancy));
+            foregroundRect.intersect(toRenderBox(renderer())->overflowClipRect(offset, relevancy));
         if (renderer()->hasClip()) {
             // Clip applies to *us* as well, so go ahead and update the damageRect.
@@ -3511 +3511 @@
     rect.move(-scrolledContentOffset());
     if (renderer()->hasOverflowClip())
-        rect.intersect(toRenderBox(renderer())->overflowClipRect(0, 0));
+        rect.intersect(toRenderBox(renderer())->overflowClipRect(IntPoint()));
     if (renderer()->hasClip())
         rect.intersect(toRenderBox(renderer())->clipRect(0, 0));

trunk/Source/WebCore/rendering/RenderLayerBacking.cpp

@@ -317 +317 @@
     IntRect result = PaintInfo::infiniteRect();
     if (renderer->hasOverflowClip())
-        result = renderer->overflowClipRect(0, 0);
+        result = renderer->overflowClipRect(IntPoint());
 
     if (renderer->hasClip())

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -1172 +1172 @@
 }
 
-IntRect RenderTable::overflowClipRect(int tx, int ty, OverlayScrollbarSizeRelevancy relevancy)
-{
-    IntRect rect = RenderBlock::overflowClipRect(tx, ty, relevancy);
+IntRect RenderTable::overflowClipRect(const IntPoint& location, OverlayScrollbarSizeRelevancy relevancy)
+{
+    IntRect rect = RenderBlock::overflowClipRect(location, relevancy);
     
     // If we have a caption, expand the clip to include the caption.
@@ -1185 +1185 @@
         if (style()->isHorizontalWritingMode()) {
             rect.setHeight(height());
-            rect.setY(ty);
+            rect.setY(location.y());
         } else {
             rect.setWidth(width());
-            rect.setX(tx);
+            rect.setX(location.x());
         }
     }
@@ -1201 +1201 @@
 
     // Check kids first.
-    if (!hasOverflowClip() || overflowClipRect(tx, ty).intersects(result.rectForPoint(pointInContainer))) {
+    if (!hasOverflowClip() || overflowClipRect(IntPoint(tx, ty)).intersects(result.rectForPoint(pointInContainer))) {
         for (RenderObject* child = lastChild(); child; child = child->previousSibling()) {
             if (child->isBox() && !toRenderBox(child)->hasSelfPaintingLayer() && (child->isTableSection() || child == m_caption)) {

trunk/Source/WebCore/rendering/RenderTable.h

@@ -232 +232 @@
     virtual void computeLogicalWidth();
 
-    virtual IntRect overflowClipRect(int tx, int ty, OverlayScrollbarSizeRelevancy relevancy = IgnoreOverlayScrollbarSize);
+    virtual IntRect overflowClipRect(const IntPoint& location, OverlayScrollbarSizeRelevancy = IgnoreOverlayScrollbarSize);
 
     virtual void addOverflowFromChildren();

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -1154 +1154 @@
     ty += y();
 
-    if (hasOverflowClip() && !overflowClipRect(tx, ty).intersects(result.rectForPoint(pointInContainer)))
+    if (hasOverflowClip() && !overflowClipRect(IntPoint(tx, ty)).intersects(result.rectForPoint(pointInContainer)))
         return false;
 

trunk/Source/WebCore/rendering/svg/RenderSVGRoot.cpp

@@ -291 +291 @@
 
     // Apply initial viewport clip - not affected by overflow handling
-    childPaintInfo.context->clip(overflowClipRect(borderBoxOriginInContainer.x(), borderBoxOriginInContainer.y()));
+    childPaintInfo.context->clip(overflowClipRect(borderBoxOriginInContainer));
 
     // Convert from container offsets (html renderers) to a relative transform (svg renderers).