Title: [206181] trunk/Source/WebCore
- Revision
- 206181
- Author
- ander...@apple.com
- Date
- 2016-09-20 15:30:49 -0700 (Tue, 20 Sep 2016)
Log Message
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:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (206180 => 206181)
--- trunk/Source/WebCore/ChangeLog 2016-09-20 22:30:29 UTC (rev 206180)
+++ trunk/Source/WebCore/ChangeLog 2016-09-20 22:30:49 UTC (rev 206181)
@@ -1,3 +1,23 @@
+2016-09-20 Anders Carlsson <ander...@apple.com>
+
+ 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-20 Alex Christensen <achristen...@webkit.org>
Fix occasional using uninitialized memory crashes after r206168.
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (206180 => 206181)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-09-20 22:30:29 UTC (rev 206180)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-09-20 22:30:49 UTC (rev 206181)
@@ -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: trunk/Source/WebCore/css/CSSValueKeywords.in (206180 => 206181)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-09-20 22:30:29 UTC (rev 206180)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-09-20 22:30:49 UTC (rev 206181)
@@ -1279,7 +1279,6 @@
plain
buy
set-up
-in-store
#endif
// font-synthesis
Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (206180 => 206181)
--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-09-20 22:30:29 UTC (rev 206180)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-09-20 22:30:49 UTC (rev 206181)
@@ -1065,8 +1065,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: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (206180 => 206181)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-09-20 22:30:29 UTC (rev 206180)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-09-20 22:30:49 UTC (rev 206181)
@@ -756,8 +756,8 @@
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle: // white | white-outline | black
return valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up | in-store
- return valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueInStore;
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up
+ return valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp;
#endif
default:
ASSERT_NOT_REACHED();
Modified: trunk/Source/WebCore/rendering/RenderThemeCocoa.mm (206180 => 206181)
--- trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-09-20 22:30:29 UTC (rev 206180)
+++ trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-09-20 22:30:49 UTC (rev 206181)
@@ -78,8 +78,6 @@
return PKPaymentButtonTypeBuy;
case ApplePayButtonType::SetUp:
return PKPaymentButtonTypeSetUp;
- case ApplePayButtonType::InStore:
- return PKPaymentButtonTypeInStore;
}
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (206180 => 206181)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-09-20 22:30:29 UTC (rev 206180)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-09-20 22:30:49 UTC (rev 206181)
@@ -707,7 +707,6 @@
Plain,
Buy,
SetUp,
- InStore,
};
#endif
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
