Changeset 109246 in webkit

Timestamp:

Feb 29, 2012 12:49:49 PM (12 years ago)

Author:

jchaffraix@webkit.org

Message:

Stop doubling maximalOutlineSize during painting
​https://bugs.webkit.org/show_bug.cgi?id=79724

Reviewed by Tony Chang.

Refactoring only, covered by existing tests (mostly repaint ones).

• rendering/RenderReplaced.cpp:

(WebCore::RenderReplaced::shouldPaint):

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::paintCollapsedBorders):
Introduce a local repaint rectangle that we inflate by the maximalOutlineSize
to simplify the comparison logic. Also tried to make it clearer what's going on
by tweaking the existing code.

• rendering/RenderTableSection.cpp:

(WebCore::RenderTableSection::paintObject):
Remove the doubling.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/RenderReplaced.cpp (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (2 diffs)
• rendering/RenderTableSection.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2012-02-29  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Stop doubling maximalOutlineSize during painting
+        https://bugs.webkit.org/show_bug.cgi?id=79724
+
+        Reviewed by Tony Chang.
+
+        Refactoring only, covered by existing tests (mostly repaint ones).
+
+        * rendering/RenderReplaced.cpp:
+        (WebCore::RenderReplaced::shouldPaint):
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paintCollapsedBorders):
+        Introduce a local repaint rectangle that we inflate by the maximalOutlineSize
+        to simplify the comparison logic. Also tried to make it clearer what's going on
+        by tweaking the existing code.
+
+        * rendering/RenderTableSection.cpp:
+        (WebCore::RenderTableSection::paintObject):
+        Remove the doubling.
+
 2012-02-29  Ken Buchanan  <kenrb@chromium.org>
 

trunk/Source/WebCore/rendering/RenderReplaced.cpp

@@ -197 +197 @@
     }
     
-    LayoutUnit os = 2 * maximalOutlineSize(paintInfo.phase);
-    if (adjustedPaintOffset.x() + minXVisualOverflow() >= paintInfo.rect.maxX() + os || adjustedPaintOffset.x() + maxXVisualOverflow() <= paintInfo.rect.x() - os)
-        return false;
-    if (top >= paintInfo.rect.maxY() + os || bottom <= paintInfo.rect.y() - os)
+    LayoutRect localRepaintRect = paintInfo.rect;
+    localRepaintRect.inflate(maximalOutlineSize(paintInfo.phase));
+    if (adjustedPaintOffset.x() + minXVisualOverflow() >= localRepaintRect.maxX() || adjustedPaintOffset.x() + maxXVisualOverflow() <= localRepaintRect.x())
+        return false;
+
+    if (top >= localRepaintRect.maxY() || bottom <= localRepaintRect.y())
         return false;
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -961 +961 @@
         return;
 
-    LayoutPoint adjustedPaintOffset = paintOffset + location();
-    LayoutUnit os = 2 * maximalOutlineSize(paintInfo.phase);
-    if (!(adjustedPaintOffset.y() - table()->outerBorderTop() < paintInfo.rect.maxY() + os
-        && adjustedPaintOffset.y() + height() + table()->outerBorderBottom() > paintInfo.rect.y() - os))
+    LayoutRect localRepaintRect = paintInfo.rect;
+    localRepaintRect.inflate(maximalOutlineSize(paintInfo.phase));
+
+    LayoutRect paintRect = LayoutRect(paintOffset + location(), size());
+    if (paintRect.y() - table()->outerBorderTop() >= localRepaintRect.maxY())
+        return;
+
+    if (paintRect.maxY() + table()->outerBorderBottom() <= localRepaintRect.y())
         return;
 
@@ -970 +974 @@
     if (!table()->currentBorderValue() || graphicsContext->paintingDisabled())
         return;
-
-    LayoutRect paintRect = LayoutRect(adjustedPaintOffset, size());
 
     RenderStyle* tableStyle = table()->style();

trunk/Source/WebCore/rendering/RenderTableSection.cpp

@@ -1061 +1061 @@
     }
 
-    // FIXME: Why do we double the outline size?
-    LayoutUnit outlineSize = 2 * maximalOutlineSize(paintPhase);
-    localRepaintRect.inflate(outlineSize);
+    localRepaintRect.inflate(maximalOutlineSize(paintPhase));
 
     CellSpan dirtiedRows = this->dirtiedRows(localRepaintRect);