[webkit-changes] [206670] branches/safari-602-branch/Source/WebCore

Fri, 30 Sep 2016 14:19:29 -0700

Title: [206670] branches/safari-602-branch/Source/WebCore

Diff

Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (206669 => 206670)


--- branches/safari-602-branch/Source/WebCore/ChangeLog	2016-09-30 21:19:37 UTC (rev 206669)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog	2016-09-30 21:19:41 UTC (rev 206670)
@@ -1,5 +1,29 @@
 2016-09-30  Babak Shafiei  <[email protected]>
 
+        Merge r206181. rdar://problem/28408526
+
+    2016-09-20  Anders Carlsson  <[email protected]>
+
+            Remove "in-store" from "-apple-pay-button-type"
+            https://bugs.webkit.org/show_bug.cgi?id=162321
+            rdar://problem/28394581
+
+            Reviewed by Beth Dakin.
+
+            * css/CSSPrimitiveValueMappings.h:
+            (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+            (WebCore::CSSPrimitiveValue::operator ApplePayButtonType):
+            * css/CSSValueKeywords.in:
+            * css/parser/CSSParser.cpp:
+            (WebCore::isValidKeywordPropertyAndValue):
+            * css/parser/CSSParserFastPaths.cpp:
+            (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+            * rendering/RenderThemeCocoa.mm:
+            (WebCore::toPKPaymentButtonType):
+            * rendering/style/RenderStyleConstants.h:
+
+2016-09-30  Babak Shafiei  <[email protected]>
+
         Merge r205992. rdar://problem/28567557
 
     2016-09-15  Anders Carlsson  <[email protected]>

Modified: branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp (206669 => 206670)


--- branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp	2016-09-30 21:19:37 UTC (rev 206669)
+++ branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp	2016-09-30 21:19:41 UTC (rev 206670)
@@ -989,8 +989,8 @@
         if (valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack)
             return true;
         break;
-    case CSSPropertyApplePayButtonType: // plain | buy | set-up | in-store
-        if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueInStore)
+    case CSSPropertyApplePayButtonType: // plain | buy | set-up
+        if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp)
             return true;
         break;
 #endif

Modified: branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h (206669 => 206670)


--- branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h	2016-09-30 21:19:37 UTC (rev 206669)
+++ branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h	2016-09-30 21:19:41 UTC (rev 206670)
@@ -5530,9 +5530,6 @@
     case ApplePayButtonType::SetUp:
         m_value.valueID = CSSValueSetUp;
         break;
-    case ApplePayButtonType::InStore:
-        m_value.valueID = CSSValueInStore;
-        break;
     default:
         ASSERT_NOT_REACHED();
         break;
@@ -5549,8 +5546,6 @@
         return ApplePayButtonType::Buy;
     case CSSValueSetUp:
         return ApplePayButtonType::SetUp;
-    case CSSValueInStore:
-        return ApplePayButtonType::InStore;
     default:
         break;
     }

Modified: branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in (206669 => 206670)


--- branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in	2016-09-30 21:19:37 UTC (rev 206669)
+++ branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in	2016-09-30 21:19:41 UTC (rev 206670)
@@ -1190,7 +1190,6 @@
 plain
 buy
 set-up
-in-store
 #endif
 
 // font-synthesis

Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm (206669 => 206670)


--- branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm	2016-09-30 21:19:37 UTC (rev 206669)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm	2016-09-30 21:19:41 UTC (rev 206670)
@@ -78,8 +78,6 @@
         return PKPaymentButtonTypeBuy;
     case ApplePayButtonType::SetUp:
         return PKPaymentButtonTypeSetUp;
-    case ApplePayButtonType::InStore:
-        return PKPaymentButtonTypeInStore;
     }
 }

Modified: branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (206669 => 206670)


--- branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h	2016-09-30 21:19:37 UTC (rev 206669)
+++ branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h	2016-09-30 21:19:41 UTC (rev 206670)
@@ -707,7 +707,6 @@
     Plain,
     Buy,
     SetUp,
-    InStore,
 };
 #endif
 

_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to