Changeset 91090 in webkit

Timestamp:

Jul 15, 2011 12:27:30 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

Avoid rounded rect corner-drawing overhead if no corners are visible
​https://bugs.webkit.org/show_bug.cgi?id=64584

Patch by Ian Henderson <​ianh@apple.com> on 2011-07-15
Reviewed by Simon Fraser.

No new tests, rendering is visually identical.

• rendering/InlineFlowBox.cpp:

(WebCore::InlineFlowBox::paintBoxDecorations): Pass PaintInfo into
paintBorder.

• rendering/RenderBox.cpp:

(WebCore::RenderBox::paintBoxDecorations): Ditto.

• rendering/RenderBoxModelObject.cpp:

(WebCore::unroundClippedCorners):
(WebCore::RenderBoxModelObject::paintBorder):
Any invisible corner may be replaced with a corner of radius zero, as
long as the stroke style is solid. Change the GraphicsContext
parameter into a PaintInfo parameter so we can get the rect to be
drawn.

• rendering/RenderBoxModelObject.h:
• rendering/RenderFieldset.cpp:

(WebCore::RenderFieldset::paintBoxDecorations): Pass PaintInfo into
paintBorder.

• rendering/RenderTable.cpp:

(WebCore::RenderTable::paintBoxDecorations): Ditto.

• rendering/RenderTableCell.cpp:

(WebCore::RenderTableCell::paintBoxDecorations): Ditto.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• rendering/InlineFlowBox.cpp (modified) (2 diffs)
• rendering/RenderBox.cpp (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (3 diffs)
• rendering/RenderBoxModelObject.h (modified) (1 diff)
• rendering/RenderFieldset.cpp (modified) (1 diff)
• rendering/RenderTable.cpp (modified) (1 diff)
• rendering/RenderTableCell.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-07-15  Ian Henderson  <ianh@apple.com>
+
+        Avoid rounded rect corner-drawing overhead if no corners are visible
+        https://bugs.webkit.org/show_bug.cgi?id=64584
+
+        Reviewed by Simon Fraser.
+
+        No new tests, rendering is visually identical.
+
+        * rendering/InlineFlowBox.cpp:
+        (WebCore::InlineFlowBox::paintBoxDecorations): Pass PaintInfo into
+        paintBorder.
+        * rendering/RenderBox.cpp:
+        (WebCore::RenderBox::paintBoxDecorations): Ditto.
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::unroundClippedCorners):
+        (WebCore::RenderBoxModelObject::paintBorder):
+        Any invisible corner may be replaced with a corner of radius zero, as
+        long as the stroke style is solid.  Change the GraphicsContext
+        parameter into a PaintInfo parameter so we can get the rect to be
+        drawn.
+        * rendering/RenderBoxModelObject.h:
+        * rendering/RenderFieldset.cpp:
+        (WebCore::RenderFieldset::paintBoxDecorations): Pass PaintInfo into
+        paintBorder.
+        * rendering/RenderTable.cpp:
+        (WebCore::RenderTable::paintBoxDecorations): Ditto.
+        * rendering/RenderTableCell.cpp:
+        (WebCore::RenderTableCell::paintBoxDecorations): Ditto.
+
 2011-07-15  Jeff Miller  <jeffm@apple.com>
 

trunk/Source/WebCore/rendering/InlineFlowBox.cpp

@@ -1135 +1135 @@
             // cases only a single call to draw is required.
             if (!hasBorderImage || (!prevLineBox() && !nextLineBox()))
-                boxModelObject()->paintBorder(context, paintRect, renderer()->style(), BackgroundBleedNone, includeLogicalLeftEdge(), includeLogicalRightEdge());
+                boxModelObject()->paintBorder(paintInfo, paintRect, renderer()->style(), BackgroundBleedNone, includeLogicalLeftEdge(), includeLogicalRightEdge());
             else {
                 // We have a border image that spans multiple lines.
@@ -1158 +1158 @@
                 GraphicsContextStateSaver stateSaver(*context);
                 context->clip(paintRect);
-                boxModelObject()->paintBorder(context, LayoutRect(stripX, stripY, stripWidth, stripHeight), renderer()->style());
+                boxModelObject()->paintBorder(paintInfo, LayoutRect(stripX, stripY, stripWidth, stripHeight), renderer()->style());
             }
         }

trunk/Source/WebCore/rendering/RenderBox.cpp

@@ -875 +875 @@
     // The theme will tell us whether or not we should also paint the CSS border.
     if ((!style()->hasAppearance() || (!themePainted && theme()->paintBorderOnly(this, paintInfo, paintRect))) && style()->hasBorder())
-        paintBorder(paintInfo.context, paintRect, style(), bleedAvoidance);
+        paintBorder(paintInfo, paintRect, style(), bleedAvoidance);
 
     if (bleedAvoidance == BackgroundBleedUseTransparencyLayer)

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -1372 +1372 @@
 }
 
-void RenderBoxModelObject::paintBorder(GraphicsContext* graphicsContext, const IntRect& rect, const RenderStyle* style,
+static void unroundClippedCorners(RoundedRect& border, const LayoutRect& clipRect)
+{
+    LayoutRect boundingRect = border.rect();
+    if (!border.isRounded() || clipRect.contains(boundingRect))
+        return;
+
+    RoundedRect::Radii adjustedRadii = border.radii();
+    bool didAdjustRadii = false;
+
+    LayoutRect topLeftRect(boundingRect.location(), adjustedRadii.topLeft());
+    if (!clipRect.intersects(topLeftRect)) {
+        adjustedRadii.setTopLeft(IntSize());
+        didAdjustRadii = true;
+    }
+
+    LayoutRect topRightRect(boundingRect.location(), adjustedRadii.topRight());
+    topRightRect.setX(boundingRect.maxX() - topRightRect.width());
+    if (!clipRect.intersects(topRightRect)) {
+        adjustedRadii.setTopRight(IntSize());
+        didAdjustRadii = true;
+    }
+
+    LayoutRect bottomLeftRect(boundingRect.location(), adjustedRadii.bottomLeft());
+    bottomLeftRect.setY(boundingRect.maxY() - bottomLeftRect.height());
+    if (!clipRect.intersects(bottomLeftRect)) {
+        adjustedRadii.setBottomLeft(IntSize());
+        didAdjustRadii = true;
+    }
+
+    LayoutRect bottomRightRect(boundingRect.location(), adjustedRadii.bottomRight());
+    bottomRightRect.setX(boundingRect.maxX() - bottomRightRect.width());
+    bottomRightRect.setY(boundingRect.maxY() - bottomRightRect.height());
+    if (!clipRect.intersects(bottomRightRect)) {
+        adjustedRadii.setBottomRight(IntSize());
+        didAdjustRadii = true;
+    }
+
+    if (didAdjustRadii)
+        border.setRadii(adjustedRadii);
+}
+
+void RenderBoxModelObject::paintBorder(const PaintInfo& info, const IntRect& rect, const RenderStyle* style,
                                        BackgroundBleedAvoidance bleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
 {
+    GraphicsContext* graphicsContext = info.context;
     // border-image is not affected by border-radius.
     if (paintNinePieceImage(graphicsContext, rect, style, style->borderImage()))
@@ -1421 +1463 @@
             haveAllSolidEdges = false;
     }
-    
+
+    // If one of the corners falls outside the clip region, pretend it has no
+    // radius to improve performance.
+    if (haveAllSolidEdges)
+        unroundClippedCorners(outerBorder, info.rect);
+
     // isRenderable() check avoids issue described in https://bugs.webkit.org/show_bug.cgi?id=38787
     if (haveAllSolidEdges && allEdgesVisible && allEdgesShareColor && innerBorder.isRenderable()) {
@@ -1614 +1661 @@
 }
 #else
-void RenderBoxModelObject::paintBorder(GraphicsContext* graphicsContext, const IntRect& rect, const RenderStyle* style,
+void RenderBoxModelObject::paintBorder(const PaintInfo& info, const IntRect& rect, const RenderStyle* style,
                                        BackgroundBleedAvoidance, bool includeLogicalLeftEdge, bool includeLogicalRightEdge)
 {
+    GraphicsContext* graphicsContext = info.context;
     // FIXME: This old version of paintBorder should be removed when all ports implement 
     // GraphicsContext::clipConvexPolygon()!! This should happen soon.

trunk/Source/WebCore/rendering/RenderBoxModelObject.h

@@ -117 +117 @@
     virtual void childBecameNonInline(RenderObject* /*child*/) { }
 
-    void paintBorder(GraphicsContext*, const IntRect&, const RenderStyle*, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
+    void paintBorder(const PaintInfo&, const IntRect&, const RenderStyle*, BackgroundBleedAvoidance = BackgroundBleedNone, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);
     bool paintNinePieceImage(GraphicsContext*, const IntRect&, const RenderStyle*, const NinePieceImage&, CompositeOperator = CompositeSourceOver);
     void paintBoxShadow(GraphicsContext*, const LayoutRect&, const RenderStyle*, ShadowStyle, bool includeLogicalLeftEdge = true, bool includeLogicalRightEdge = true);

trunk/Source/WebCore/rendering/RenderFieldset.cpp

@@ -166 +166 @@
     }
 
-    paintBorder(paintInfo.context, paintRect, style());
+    paintBorder(paintInfo, paintRect, style());
 }
 

trunk/Source/WebCore/rendering/RenderTable.cpp

@@ -570 +570 @@
 
     if (style()->hasBorder() && !collapseBorders())
-        paintBorder(paintInfo.context, rect, style());
+        paintBorder(paintInfo, rect, style());
 }
 

trunk/Source/WebCore/rendering/RenderTableCell.cpp

@@ -1018 +1018 @@
         return;
 
-    paintBorder(paintInfo.context, paintRect, style());
+    paintBorder(paintInfo, paintRect, style());
 }