Changeset 237280 in webkit

Timestamp:

Oct 18, 2018 9:39:30 PM (6 years ago)

Author:

commit-queue@webkit.org

Message:

[CG] Adopt CG SPI for non-even cornered rounded rects
​https://bugs.webkit.org/show_bug.cgi?id=190155

Patch by Said Abou-Hallawa <​sabouhallawa@apple.com> on 2018-10-18
Reviewed by Simon Fraser.

Source/WebCore:

Instead of creating bezier curves for the non-even corners of the rounded
rects, we should use the optimized SPI provided by CG.

• platform/graphics/cg/PathCG.cpp:

(WebCore::Path::platformAddPathForRoundedRect):

Source/WebCore/PAL:

• pal/spi/cg/CoreGraphicsSPI.h:

LayoutTests:

This test fails on iOS simulator because of just one pixel difference.
I think it happens because of anti aliasing the color at the border of
the black shadow. Since this test is testing the radius attribute of the
CSS box-shadow and this should not be affected by whether the shadow has
non-even rounded corners or not, I am going to change it to have even
rounded corners.

• fast/box-shadow/box-shadow-with-zero-radius-expected.html:
• fast/box-shadow/box-shadow-with-zero-radius.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.html (modified) (2 diffs)
• LayoutTests/fast/box-shadow/box-shadow-with-zero-radius.html (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/PAL/ChangeLog (modified) (1 diff)
• Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h (modified) (1 diff)
• Source/WebCore/platform/graphics/cg/PathCG.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2018-10-18  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [CG] Adopt CG SPI for non-even cornered rounded rects
+        https://bugs.webkit.org/show_bug.cgi?id=190155
+
+        Reviewed by Simon Fraser.
+
+        This test fails on iOS simulator because of just one pixel difference.
+        I think it happens because of anti aliasing the color at the border of
+        the black shadow. Since this test is testing the radius attribute of the
+        CSS box-shadow and this should not be affected by whether the shadow has
+        non-even rounded corners or not, I am going to change it to have even 
+        rounded corners.
+
+        * fast/box-shadow/box-shadow-with-zero-radius-expected.html:
+        * fast/box-shadow/box-shadow-with-zero-radius.html:
+
 2018-10-18  Justin Fan  <justin_fan@apple.com>
 

trunk/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.html

@@ -21 +21 @@
     height: 120px;
     border-top-right-radius: 60px 60px;
-    border-bottom-left-radius: 70px 60px;
+    border-bottom-left-radius: 60px 60px;
     background-color: yellow;
 }
@@ -43 +43 @@
     height: 140px;
     border-top-right-radius: 70px 70px;
-    border-bottom-left-radius: 80px 70px;
+    border-bottom-left-radius: 70px 70px;
     background-color: black;
 }

trunk/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius.html

@@ -22 +22 @@
     height: 120px;
     border-top-right-radius: 60px 60px;
-    border-bottom-left-radius: 70px 60px;
+    border-bottom-left-radius: 60px 60px;
     background-color: yellow;
     box-shadow: 110px 150px 0px 10px #000000;

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2018-10-18  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [CG] Adopt CG SPI for non-even cornered rounded rects
+        https://bugs.webkit.org/show_bug.cgi?id=190155
+
+        Reviewed by Simon Fraser.
+
+        Instead of creating bezier curves for the non-even corners of the rounded
+        rects, we should use the optimized SPI provided by CG.
+
+        * platform/graphics/cg/PathCG.cpp:
+        (WebCore::Path::platformAddPathForRoundedRect):
+
 2018-10-18  Justin Michaud  <justin_michaud@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2018-10-18  Said Abou-Hallawa  <sabouhallawa@apple.com>
+
+        [CG] Adopt CG SPI for non-even cornered rounded rects
+        https://bugs.webkit.org/show_bug.cgi?id=190155
+
+        Reviewed by Simon Fraser.
+
+        * pal/spi/cg/CoreGraphicsSPI.h:
+
 2018-10-18  Alexey Proskuryakov  <ap@apple.com>
 

trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h

@@ -282 +282 @@
 
 void CGContextDrawConicGradient(CGContextRef, CGGradientRef, CGPoint center, CGFloat angle);
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
+void CGPathAddUnevenCornersRoundedRect(CGMutablePathRef, const CGAffineTransform *, CGRect, const CGSize corners[4]);
+#endif
 #endif
 

trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp

@@ -319 +319 @@
         return;
     }
+
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED >= 101400) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED >= 120000)
+    CGRect rectToDraw = rect;
+    CGSize corners[4] = { bottomLeftRadius, bottomRightRadius, topRightRadius, topLeftRadius };
+    CGPathAddUnevenCornersRoundedRect(ensurePlatformPath(), nullptr, rectToDraw, corners);
+    return;
+#endif
 #endif