Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (208420 => 208421)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2016-11-07 06:12:36 UTC (rev 208421)
@@ -1,3 +1,44 @@
+2016-11-06 Matthew Hanson <[email protected]>
+
+ Merge r208392. rdar://problem/28409526
+
+ 2016-11-03 Anders Carlsson <[email protected]>
+
+ Add new 'other' Apple Pay button style
+ https://bugs.webkit.org/show_bug.cgi?id=164384
+ rdar://problem/28302528
+
+ Reviewed by Dean Jackson.
+
+ * DerivedSources.make:
+ * WebCorePrefix.h:
+ Add extension points.
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ Add ApplePayButtonType::Other.
+
+ (WebCore::CSSPrimitiveValue::operator ApplePayButtonType):
+ Add CSSValueOther.
+
+ * css/CSSValueKeywords.in:
+ Add other.
+
+ * css/parser/CSSParser.cpp:
+ (WebCore::isValidKeywordPropertyAndValue):
+ Add CSSValueOther.
+
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ Add CSSValueOther.
+
+ * rendering/RenderThemeCocoa.mm:
+ (WebCore::toPKPaymentButtonType):
+ Handle ApplePayButtonType::Other.
+
+ * rendering/style/RenderStyleConstants.h:
+ Add ApplePayButtonType::Other.
+
2016-11-03 Matthew Hanson <[email protected]>
Merge r208328. rdar://problem/29084886
Modified: branches/safari-602-branch/Source/WebCore/DerivedSources.make (208420 => 208421)
--- branches/safari-602-branch/Source/WebCore/DerivedSources.make 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/DerivedSources.make 2016-11-07 06:12:36 UTC (rev 208421)
@@ -791,6 +791,8 @@
-include WebCoreDerivedSourcesAdditions.make
+-include ApplePayWebCoreDerivedSourcesAdditions.make
+
NON_SVG_BINDING_IDLS += $(ADDITIONAL_BINDING_IDLS)
all : $(ADDITIONAL_BINDING_IDLS:%.idl=JS%.h)
@@ -896,6 +898,7 @@
WEBCORE_CSS_PROPERTY_NAMES := $(WebCore)/css/CSSPropertyNames.in
WEBCORE_CSS_VALUE_KEYWORDS := $(WebCore)/css/CSSValueKeywords.in
WEBCORE_CSS_VALUE_KEYWORDS := $(WEBCORE_CSS_VALUE_KEYWORDS) $(WebCore)/css/SVGCSSValueKeywords.in
+WEBCORE_CSS_VALUE_KEYWORDS_DEFINES := $(FEATURE_DEFINES) $(ADDITIONAL_CSS_VALUE_KEYWORDS_DEFINES)
CSSPropertyNames.h CSSPropertyNames.cpp StyleBuilder.cpp StylePropertyShorthandFunctions.h StylePropertyShorthandFunctions.cpp : makeprop.intermediate
.INTERMEDIATE : makeprop.intermediate
@@ -907,7 +910,7 @@
.INTERMEDIATE : makevalues.intermediate
makevalues.intermediate : $(WEBCORE_CSS_VALUE_KEYWORDS) css/makevalues.pl bindings/scripts/preprocessor.pm $(PLATFORM_FEATURE_DEFINES)
$(PERL) -pe '' $(WEBCORE_CSS_VALUE_KEYWORDS) > CSSValueKeywords.in
- $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(FEATURE_DEFINES)"
+ $(PERL) -I$(WebCore)/bindings/scripts "$(WebCore)/css/makevalues.pl" --defines "$(WEBCORE_CSS_VALUE_KEYWORDS_DEFINES)"
# --------
Modified: branches/safari-602-branch/Source/WebCore/WebCorePrefix.h (208420 => 208421)
--- branches/safari-602-branch/Source/WebCore/WebCorePrefix.h 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/WebCorePrefix.h 2016-11-07 06:12:36 UTC (rev 208421)
@@ -172,6 +172,10 @@
#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)
+#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: branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp (208420 => 208421)
--- branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/css/CSSParser.cpp 2016-11-07 06:12:36 UTC (rev 208421)
@@ -982,8 +982,8 @@
if (valueID == CSSValueWhite || valueID == CSSValueWhiteOutline || valueID == CSSValueBlack)
return true;
break;
- case CSSPropertyApplePayButtonType: // plain | buy | set-up
- if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp)
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | other
+ if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueOther)
return true;
break;
#endif
Modified: branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h (208420 => 208421)
--- branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/css/CSSPrimitiveValueMappings.h 2016-11-07 06:12:36 UTC (rev 208421)
@@ -5530,6 +5530,10 @@
case ApplePayButtonType::SetUp:
m_value.valueID = CSSValueSetUp;
break;
+ case ApplePayButtonType::Other:
+ m_value.valueID = CSSValueOther;
+ break;
+
default:
ASSERT_NOT_REACHED();
break;
@@ -5546,6 +5550,8 @@
return ApplePayButtonType::Buy;
case CSSValueSetUp:
return ApplePayButtonType::SetUp;
+ case CSSValueOther:
+ return ApplePayButtonType::Other;
default:
break;
}
Modified: branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in (208420 => 208421)
--- branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/css/CSSValueKeywords.in 2016-11-07 06:12:36 UTC (rev 208421)
@@ -1190,6 +1190,7 @@
plain
buy
set-up
+other
#endif
// font-synthesis
Modified: branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm (208420 => 208421)
--- branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/rendering/RenderThemeCocoa.mm 2016-11-07 06:12:36 UTC (rev 208421)
@@ -78,6 +78,9 @@
return PKPaymentButtonTypeBuy;
case ApplePayButtonType::SetUp:
return PKPaymentButtonTypeSetUp;
+ case ApplePayButtonType::Other:
+ // FIXME: Use a named constant here.
+ return (PKPaymentButtonType)4;
}
}
Modified: branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h (208420 => 208421)
--- branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-11-05 18:00:29 UTC (rev 208420)
+++ branches/safari-602-branch/Source/WebCore/rendering/style/RenderStyleConstants.h 2016-11-07 06:12:36 UTC (rev 208421)
@@ -707,6 +707,7 @@
Plain,
Buy,
SetUp,
+ Other,
};
#endif
