Diff
Modified: trunk/Source/WebCore/ChangeLog (208913 => 208914)
--- trunk/Source/WebCore/ChangeLog 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/ChangeLog 2016-11-19 02:45:25 UTC (rev 208914)
@@ -1,3 +1,24 @@
+2016-11-18 Anders Carlsson <[email protected]>
+
+ Rename the 'other' Apple Pay Button type to 'donate'
+ https://bugs.webkit.org/show_bug.cgi?id=164978
+
+ Reviewed by Dean Jackson.
+
+ * DerivedSources.make:
+ * WebCorePrefix.h:
+ * 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-11-18 Myles C. Maxfield <[email protected]>
[WebGL2] Implement texStorage2D()
Modified: trunk/Source/WebCore/DerivedSources.make (208913 => 208914)
--- trunk/Source/WebCore/DerivedSources.make 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/DerivedSources.make 2016-11-19 02:45:25 UTC (rev 208914)
@@ -833,8 +833,6 @@
-include WebCoreDerivedSourcesAdditions.make
--include ApplePayWebCoreDerivedSourcesAdditions.make
-
JS_BINDING_IDLS += $(ADDITIONAL_BINDING_IDLS)
all : $(ADDITIONAL_BINDING_IDLS:%.idl=JS%.h)
Modified: trunk/Source/WebCore/WebCorePrefix.h (208913 => 208914)
--- trunk/Source/WebCore/WebCorePrefix.h 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/WebCorePrefix.h 2016-11-19 02:45:25 UTC (rev 208914)
@@ -175,10 +175,6 @@
#define delete ("if you use new/delete make sure to include config.h at the top of the file"())
#endif
-#if USE(APPLE_INTERNAL_SDK) && __has_include(<WebKitAdditions/ApplePayWebCorePrefixAdditions.h>)
-#include <WebKitAdditions/ApplePayWebCorePrefixAdditions.h>
-#endif
-
/* When C++ exceptions are disabled, the C++ library defines |try| and |catch|
* to allow C++ code that expects exceptions to build. These definitions
* interfere with Objective-C++ uses of Objective-C exception handlers, which
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (208913 => 208914)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-11-19 02:45:25 UTC (rev 208914)
@@ -5488,8 +5488,8 @@
case ApplePayButtonType::SetUp:
m_value.valueID = CSSValueSetUp;
break;
- case ApplePayButtonType::Other:
- m_value.valueID = CSSValueOther;
+ case ApplePayButtonType::Donate:
+ m_value.valueID = CSSValueDonate;
break;
default:
@@ -5508,8 +5508,8 @@
return ApplePayButtonType::Buy;
case CSSValueSetUp:
return ApplePayButtonType::SetUp;
- case CSSValueOther:
- return ApplePayButtonType::Other;
+ case CSSValueDonate:
+ return ApplePayButtonType::Donate;
default:
break;
}
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (208913 => 208914)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2016-11-19 02:45:25 UTC (rev 208914)
@@ -1292,7 +1292,7 @@
plain
buy
set-up
-other
+donate
#endif
// font-synthesis
Modified: trunk/Source/WebCore/css/parser/CSSParser.cpp (208913 => 208914)
--- trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/css/parser/CSSParser.cpp 2016-11-19 02:45:25 UTC (rev 208914)
@@ -1057,8 +1057,8 @@
if (valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack)
return true;
break;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up | other
- if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueOther)
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate
+ if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueDonate)
return true;
break;
#endif
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (208913 => 208914)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2016-11-19 02:45:25 UTC (rev 208914)
@@ -781,8 +781,8 @@
#if ENABLE(APPLE_PAY)
case CSSPropertyApplePayButtonStyle: // white | white-outline | black
return valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up | other
- return valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueOther;
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate
+ return valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueDonate;
#endif
case CSSPropertyWebkitNbspMode: // normal | space
return valueID == CSSValueNormal || valueID == CSSValueSpace;
Modified: trunk/Source/WebCore/rendering/RenderThemeCocoa.mm (208913 => 208914)
--- trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-11-19 02:45:25 UTC (rev 208914)
@@ -78,7 +78,7 @@
return PKPaymentButtonTypeBuy;
case ApplePayButtonType::SetUp:
return PKPaymentButtonTypeSetUp;
- case ApplePayButtonType::Other:
+ case ApplePayButtonType::Donate:
// FIXME: Use a named constant here.
return (PKPaymentButtonType)4;
}
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (208913 => 208914)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-11-19 01:46:01 UTC (rev 208913)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-11-19 02:45:25 UTC (rev 208914)
@@ -706,7 +706,7 @@
Plain,
Buy,
SetUp,
- Other,
+ Donate,
};
#endif
