Changeset 215613 in webkit

Timestamp:

Apr 21, 2017, 9:58:49 AM (8 years ago)

Author:

yoon@igalia.com

Message:

Do not paint the border of the box if the dirty region does not intersect with border area
​https://bugs.webkit.org/show_bug.cgi?id=170988

Reviewed by Simon Fraser.

No new tests, since there is no change in behavior.

• platform/graphics/GeometryUtilities.cpp:

(WebCore::ellipseContainsPoint):
Checks if a point is within an ellipse.

• platform/graphics/GeometryUtilities.h:

Replace header-guards with #pragma once.

• platform/graphics/RoundedRect.cpp:

(WebCore::RoundedRect::contains):
Implemented to know the dirty rectangle intersects with rounded rectangle or not.

• platform/graphics/RoundedRect.h:
• rendering/RenderBoxModelObject.cpp:

(WebCore::RenderBoxModelObject::paintBorder):
When typing in decorated text box, the dirty rect generated only for the
inside of the text box, not for the decorations. So we can avoid the
calculations to draw borders if the inner border totally covers the
target surface. It will optimize the rendering process since we don't
have to render border decorations whenever we type somethings in side of
the text input element.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/graphics/GeometryUtilities.cpp (modified) (1 diff)
• platform/graphics/GeometryUtilities.h (modified) (2 diffs)
• platform/graphics/RoundedRect.cpp (modified) (2 diffs)
• platform/graphics/RoundedRect.h (modified) (1 diff)
• rendering/RenderBoxModelObject.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-04-21  Gwang Yoon Hwang  <yoon@igalia.com>
+
+        Do not paint the border of the box if the dirty region does not intersect with border area
+        https://bugs.webkit.org/show_bug.cgi?id=170988
+
+        Reviewed by Simon Fraser.
+
+        No new tests, since there is no change in behavior.
+
+        * platform/graphics/GeometryUtilities.cpp:
+        (WebCore::ellipseContainsPoint):
+        Checks if a point is within an ellipse.
+
+        * platform/graphics/GeometryUtilities.h:
+        Replace header-guards with #pragma once.
+
+        * platform/graphics/RoundedRect.cpp:
+        (WebCore::RoundedRect::contains):
+        Implemented to know the dirty rectangle intersects with rounded rectangle or not.
+        * platform/graphics/RoundedRect.h:
+        * rendering/RenderBoxModelObject.cpp:
+        (WebCore::RenderBoxModelObject::paintBorder):
+        When typing in decorated text box, the dirty rect generated only for the
+        inside of the text box, not for the decorations.  So we can avoid the
+        calculations to draw borders if the inner border totally covers the
+        target surface. It will optimize the rendering process since we don't
+        have to render border decorations whenever we type somethings in side of
+        the text input element.
+
 2017-04-21  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/platform/graphics/GeometryUtilities.cpp

@@ -147 +147 @@
 }
 
+bool ellipseContainsPoint(const FloatPoint& center, const FloatSize& radii, const FloatPoint& point)
+{
+    FloatPoint transformedPoint(point);
+    transformedPoint.move(-center.x(), -center.y());
+    transformedPoint.scale(radii.height(), radii.width());
+    float radius = radii.width() * radii.height();
+
+    if (transformedPoint.x() > radius || transformedPoint.y() > radius)
+        return false;
+    if (transformedPoint.x() + transformedPoint.y() <= radius)
+        return true;
+    return (transformedPoint.lengthSquared() <= radius * radius);
 }
+
+}

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

@@ -24 +24 @@
  */
 
-#ifndef GeometryUtilities_h
-#define GeometryUtilities_h
+#pragma once
 
 #include "FloatRect.h"
@@ -52 +51 @@
 FloatRect boundsOfRotatingRect(const FloatRect&);
 
+bool ellipseContainsPoint(const FloatPoint& center, const FloatSize& radii, const FloatPoint&);
 }
-
-#endif // GeometryUtilities_h

trunk/Source/WebCore/platform/graphics/RoundedRect.cpp

@@ -30 +30 @@
 
 #include "FloatRoundedRect.h"
+#include "GeometryUtilities.h"
 #include "LayoutRect.h"
 #include "LayoutUnit.h"
@@ -237 +238 @@
 }
 
+bool RoundedRect::contains(const LayoutRect& otherRect) const
+{
+    if (!rect().contains(otherRect))
+        return false;
+
+    const LayoutSize& topLeft = m_radii.topLeft();
+    if (!topLeft.isEmpty()) {
+        FloatPoint center = { m_rect.x() + topLeft.width(), m_rect.y() + topLeft.height() };
+        if (otherRect.x() <= center.x() && otherRect.y() <= center.y()) {
+            if (!ellipseContainsPoint(center, topLeft, otherRect.location()))
+                return false;
+        }
+    }
+
+    const LayoutSize& topRight = m_radii.topRight();
+    if (!topRight.isEmpty()) {
+        FloatPoint center = { m_rect.maxX() - topRight.width(), m_rect.y() + topRight.height() };
+        if (otherRect.maxX() >= center.x() && otherRect.y() <= center.y()) {
+            if (!ellipseContainsPoint(center, topRight, otherRect.location()))
+                return false;
+        }
+    }
+
+    const LayoutSize& bottomLeft = m_radii.bottomLeft();
+    if (!bottomLeft.isEmpty()) {
+        FloatPoint center = { m_rect.x() + bottomLeft.width(), m_rect.maxY() - bottomLeft.height() };
+        if (otherRect.maxX() >= center.x() && otherRect.maxY() >= center.y()) {
+            if (!ellipseContainsPoint(center, bottomLeft, otherRect.location()))
+                return false;
+        }
+    }
+
+    const LayoutSize& bottomRight = m_radii.bottomRight();
+    if (!bottomRight.isEmpty()) {
+        FloatPoint center = { m_rect.maxX() - bottomRight.width(), m_rect.maxY() - bottomRight.height() };
+        if (otherRect.x() <= center.x() && otherRect.maxY() >= center.y()) {
+            if (!ellipseContainsPoint(center, bottomRight, otherRect.location()))
+                return false;
+        }
+    }
+
+    return true;
+}
+
 FloatRoundedRect RoundedRect::pixelSnappedRoundedRectForPainting(float deviceScaleFactor) const
 {

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

@@ -107 +107 @@
     // This only works for convex quads.
     bool intersectsQuad(const FloatQuad&) const;
+    bool contains(const LayoutRect&) const;
 
     FloatRoundedRect pixelSnappedRoundedRectForPainting(float deviceScaleFactor) const;

trunk/Source/WebCore/rendering/RenderBoxModelObject.cpp

@@ -1735 +1735 @@
     RoundedRect innerBorder = style.getRoundedInnerBorderFor(borderInnerRectAdjustedForBleedAvoidance(graphicsContext, rect, bleedAvoidance), includeLogicalLeftEdge, includeLogicalRightEdge);
 
+    // If no borders intersects with the dirty area, we can skip the border painting.
+    if (innerBorder.contains(info.rect))
+        return;
+
     bool haveAlphaColor = false;
     bool haveAllSolidEdges = true;