Title: [237359] trunk
Revision
237359
Author
ryanhad...@apple.com
Date
2018-10-23 11:17:11 -0700 (Tue, 23 Oct 2018)

Log Message

Unreviewed, rolling out r237280.

Causes fast/box-shadow/box-shadow-with-zero-radius.html to
fail on iOS Simulator.

Reverted changeset:

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

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (237358 => 237359)


--- trunk/LayoutTests/ChangeLog	2018-10-23 18:15:34 UTC (rev 237358)
+++ trunk/LayoutTests/ChangeLog	2018-10-23 18:17:11 UTC (rev 237359)
@@ -1,5 +1,18 @@
 2018-10-23  Ryan Haddad  <ryanhad...@apple.com>
 
+        Unreviewed, rolling out r237280.
+
+        Causes fast/box-shadow/box-shadow-with-zero-radius.html to
+        fail on iOS Simulator.
+
+        Reverted changeset:
+
+        "[CG] Adopt CG SPI for non-even cornered rounded rects"
+        https://bugs.webkit.org/show_bug.cgi?id=190155
+        https://trac.webkit.org/changeset/237280
+
+2018-10-23  Ryan Haddad  <ryanhad...@apple.com>
+
         [macOS Debug WK1] Layout Test inspector/codemirror/prettyprinting-css.html is a flaky timeout
         https://bugs.webkit.org/show_bug.cgi?id=190833
 

Modified: trunk/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.html (237358 => 237359)


--- trunk/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.html	2018-10-23 18:15:34 UTC (rev 237358)
+++ trunk/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.html	2018-10-23 18:17:11 UTC (rev 237359)
@@ -20,7 +20,7 @@
     width: 120px;
     height: 120px;
     border-top-right-radius: 60px 60px;
-    border-bottom-left-radius: 60px 60px;
+    border-bottom-left-radius: 70px 60px;
     background-color: yellow;
 }
 
@@ -42,7 +42,7 @@
     width: 140px;
     height: 140px;
     border-top-right-radius: 70px 70px;
-    border-bottom-left-radius: 70px 70px;
+    border-bottom-left-radius: 80px 70px;
     background-color: black;
 }
 

Modified: trunk/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius.html (237358 => 237359)


--- trunk/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius.html	2018-10-23 18:15:34 UTC (rev 237358)
+++ trunk/LayoutTests/fast/box-shadow/box-shadow-with-zero-radius.html	2018-10-23 18:17:11 UTC (rev 237359)
@@ -21,7 +21,7 @@
     width: 120px;
     height: 120px;
     border-top-right-radius: 60px 60px;
-    border-bottom-left-radius: 60px 60px;
+    border-bottom-left-radius: 70px 60px;
     background-color: yellow;
     box-shadow: 110px 150px 0px 10px #000000;
 }

Modified: trunk/Source/WebCore/ChangeLog (237358 => 237359)


--- trunk/Source/WebCore/ChangeLog	2018-10-23 18:15:34 UTC (rev 237358)
+++ trunk/Source/WebCore/ChangeLog	2018-10-23 18:17:11 UTC (rev 237359)
@@ -1,3 +1,16 @@
+2018-10-23  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, rolling out r237280.
+
+        Causes fast/box-shadow/box-shadow-with-zero-radius.html to
+        fail on iOS Simulator.
+
+        Reverted changeset:
+
+        "[CG] Adopt CG SPI for non-even cornered rounded rects"
+        https://bugs.webkit.org/show_bug.cgi?id=190155
+        https://trac.webkit.org/changeset/237280
+
 2018-10-23  Antti Koivisto  <an...@apple.com>
 
         topPrivatelyControlledDomain is slow

Modified: trunk/Source/WebCore/PAL/ChangeLog (237358 => 237359)


--- trunk/Source/WebCore/PAL/ChangeLog	2018-10-23 18:15:34 UTC (rev 237358)
+++ trunk/Source/WebCore/PAL/ChangeLog	2018-10-23 18:17:11 UTC (rev 237359)
@@ -1,3 +1,16 @@
+2018-10-23  Ryan Haddad  <ryanhad...@apple.com>
+
+        Unreviewed, rolling out r237280.
+
+        Causes fast/box-shadow/box-shadow-with-zero-radius.html to
+        fail on iOS Simulator.
+
+        Reverted changeset:
+
+        "[CG] Adopt CG SPI for non-even cornered rounded rects"
+        https://bugs.webkit.org/show_bug.cgi?id=190155
+        https://trac.webkit.org/changeset/237280
+
 2018-10-18  Said Abou-Hallawa  <sabouhall...@apple.com>
 
         [CG] Adopt CG SPI for non-even cornered rounded rects

Modified: trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h (237358 => 237359)


--- trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h	2018-10-23 18:15:34 UTC (rev 237358)
+++ trunk/Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h	2018-10-23 18:17:11 UTC (rev 237359)
@@ -281,11 +281,7 @@
 void CGContextSetStyle(CGContextRef, CGStyleRef);
 
 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
 
 #if PLATFORM(WIN)
 CGFontCache* CGFontCacheGetLocalCache();

Modified: trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp (237358 => 237359)


--- trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp	2018-10-23 18:15:34 UTC (rev 237358)
+++ trunk/Source/WebCore/platform/graphics/cg/PathCG.cpp	2018-10-23 18:17:11 UTC (rev 237359)
@@ -318,14 +318,7 @@
         CGPathAddRoundedRect(ensurePlatformPath(), nullptr, rectToDraw, radiusWidth, radiusHeight);
         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
 
     addBeziersForRoundedRect(rect, topLeftRadius, topRightRadius, bottomLeftRadius, bottomRightRadius);
 }
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to