Unreviewed, rolling out r237280.
authorryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Oct 2018 18:17:11 +0000 (18:17 +0000)
committerryanhaddad@apple.com <ryanhaddad@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 23 Oct 2018 18:17:11 +0000 (18:17 +0000)
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

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@237359 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/fast/box-shadow/box-shadow-with-zero-radius-expected.html
LayoutTests/fast/box-shadow/box-shadow-with-zero-radius.html
Source/WebCore/ChangeLog
Source/WebCore/PAL/ChangeLog
Source/WebCore/PAL/pal/spi/cg/CoreGraphicsSPI.h
Source/WebCore/platform/graphics/cg/PathCG.cpp

index 4c673c1..cfd87ca 100644 (file)
@@ -1,5 +1,18 @@
 2018-10-23  Ryan Haddad  <ryanhaddad@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  <ryanhaddad@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
 
index edd5914..46e5457 100644 (file)
@@ -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;
 }
 
index f014394..730c1d0 100644 (file)
@@ -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;
 }
index 3e05d30..b91aaa0 100644 (file)
@@ -1,3 +1,16 @@
+2018-10-23  Ryan Haddad  <ryanhaddad@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  <antti@apple.com>
 
         topPrivatelyControlledDomain is slow
index c5cb2d0..4982e02 100644 (file)
@@ -1,3 +1,16 @@
+2018-10-23  Ryan Haddad  <ryanhaddad@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  <sabouhallawa@apple.com>
 
         [CG] Adopt CG SPI for non-even cornered rounded rects
index 7f1e104..c0de3b2 100644 (file)
@@ -281,10 +281,6 @@ CGStyleRef CGStyleCreateFocusRingWithColor(const CGFocusRingStyle*, CGColorRef);
 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)
index a96067c..62ed182 100644 (file)
@@ -318,13 +318,6 @@ void Path::platformAddPathForRoundedRect(const FloatRect& rect, const FloatSize&
         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);