Diff
Modified: trunk/LayoutTests/ChangeLog (236614 => 236615)
--- trunk/LayoutTests/ChangeLog 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/LayoutTests/ChangeLog 2018-09-28 22:06:02 UTC (rev 236615)
@@ -1,3 +1,14 @@
+2018-09-28 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove the "in-store" button type
+ https://bugs.webkit.org/show_bug.cgi?id=190079
+
+ Reviewed by Tim Horton.
+
+ * http/tests/ssl/applepay/ApplePayButton.html:
+ * platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.png:
+ * platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt:
+
2018-09-28 Dawei Fenton <[email protected]>
WebGL conformance: Failures and Timeouts in suite 2.0.0/conformance
Modified: trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html (236614 => 236615)
--- trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/LayoutTests/http/tests/ssl/applepay/ApplePayButton.html 2018-09-28 22:06:02 UTC (rev 236615)
@@ -33,10 +33,6 @@
-apple-pay-button-type: set-up;
}
- .in-store {
- -apple-pay-button-type: in-store;
- }
-
.donate {
-apple-pay-button-type: donate;
}
@@ -45,7 +41,7 @@
<body>
<script>
for (let style of ["white", "white-outline", "black"]) {
- for (let type of ["plain", "buy", "set-up", "in-store", "donate"]) {
+ for (let type of ["plain", "buy", "set-up", "donate"]) {
var button = document.createElement("button");
button.classList.add("apple-pay-button", style, type);
document.body.appendChild(button);
Modified: trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt (236614 => 236615)
--- trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/LayoutTests/platform/mac/http/tests/ssl/applepay/ApplePayButton-expected.txt 2018-09-28 22:06:02 UTC (rev 236615)
@@ -1,20 +1,17 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x494
- RenderBlock {HTML} at (0,0) size 800x494
- RenderBody {BODY} at (8,8) size 784x478
+layer at (0,0) size 800x398
+ RenderBlock {HTML} at (0,0) size 800x398
+ RenderBody {BODY} at (8,8) size 784x382
RenderButton {BUTTON} at (2,0) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,32) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,64) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,96) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,128) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,160) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,128) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,160) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,192) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,224) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,256) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,256) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,288) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,320) size 100x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,320) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,352) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,384) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,416) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,448) size 140x30 [color=#000000D8] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
Modified: trunk/LayoutTests/platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.png
(Binary files differ)
Modified: trunk/LayoutTests/platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.txt (236614 => 236615)
--- trunk/LayoutTests/platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.txt 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/LayoutTests/platform/mac-highsierra/http/tests/ssl/applepay/ApplePayButton-expected.txt 2018-09-28 22:06:02 UTC (rev 236615)
@@ -1,20 +1,17 @@
layer at (0,0) size 800x600
RenderView at (0,0) size 800x600
-layer at (0,0) size 800x494
- RenderBlock {HTML} at (0,0) size 800x494
- RenderBody {BODY} at (8,8) size 784x478
+layer at (0,0) size 800x398
+ RenderBlock {HTML} at (0,0) size 800x398
+ RenderBody {BODY} at (8,8) size 784x382
RenderButton {BUTTON} at (2,0) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,32) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,64) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,96) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,128) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,160) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,128) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,160) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,192) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,224) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,256) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,256) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,288) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,320) size 100x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+ RenderButton {BUTTON} at (2,320) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
RenderButton {BUTTON} at (2,352) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,384) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,416) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
- RenderButton {BUTTON} at (2,448) size 140x30 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
Modified: trunk/Source/WebCore/ChangeLog (236614 => 236615)
--- trunk/Source/WebCore/ChangeLog 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/Source/WebCore/ChangeLog 2018-09-28 22:06:02 UTC (rev 236615)
@@ -1,3 +1,25 @@
+2018-09-28 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove the "in-store" button type
+ https://bugs.webkit.org/show_bug.cgi?id=190079
+
+ Reviewed by Tim Horton.
+
+ According to <https://developer.apple.com/design/human-interface-guidelines/apple-pay/buttons-and-marks/buttons/>,
+ this button is meant only for certain kinds of native apps. It shouldn't be available on the web.
+
+ Updated http/tests/ssl/applepay/ApplePayButton.html.
+
+ * css/CSSPrimitiveValueMappings.h:
+ (WebCore::CSSPrimitiveValue::CSSPrimitiveValue):
+ (WebCore::CSSPrimitiveValue::operator ApplePayButtonType const):
+ * css/CSSValueKeywords.in:
+ * css/parser/CSSParserFastPaths.cpp:
+ (WebCore::CSSParserFastPaths::isValidKeywordPropertyAndValue):
+ * rendering/RenderThemeCocoa.mm:
+ (WebCore::toPKPaymentButtonType):
+ * rendering/style/RenderStyleConstants.h:
+
2018-09-28 Chris Dumez <[email protected]>
document.open() should throw errors for cross-origin calls
Modified: trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h (236614 => 236615)
--- trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/Source/WebCore/css/CSSPrimitiveValueMappings.h 2018-09-28 22:06:02 UTC (rev 236615)
@@ -5471,9 +5471,6 @@
case ApplePayButtonType::SetUp:
m_value.valueID = CSSValueSetUp;
break;
- case ApplePayButtonType::InStore:
- m_value.valueID = CSSValueInStore;
- break;
case ApplePayButtonType::Donate:
m_value.valueID = CSSValueDonate;
break;
@@ -5505,8 +5502,6 @@
return ApplePayButtonType::Buy;
case CSSValueSetUp:
return ApplePayButtonType::SetUp;
- case CSSValueInStore:
- return ApplePayButtonType::InStore;
case CSSValueDonate:
return ApplePayButtonType::Donate;
#if ENABLE(APPLE_PAY_SESSION_V4)
Modified: trunk/Source/WebCore/css/CSSValueKeywords.in (236614 => 236615)
--- trunk/Source/WebCore/css/CSSValueKeywords.in 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/Source/WebCore/css/CSSValueKeywords.in 2018-09-28 22:06:02 UTC (rev 236615)
@@ -1334,7 +1334,6 @@
plain
buy
set-up
-in-store
donate
#if defined(ENABLE_APPLE_PAY_SESSION_V4) && ENABLE_APPLE_PAY_SESSION_V4
check-out
Modified: trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp (236614 => 236615)
--- trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/Source/WebCore/css/parser/CSSParserFastPaths.cpp 2018-09-28 22:06:02 UTC (rev 236615)
@@ -769,10 +769,11 @@
#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 | donate | check-out | book | subscribe
- if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueInStore || valueID == CSSValueDonate)
+ case CSSPropertyApplePayButtonType: // plain | buy | set-up | donate
+ if (valueID == CSSValuePlain || valueID == CSSValueBuy || valueID == CSSValueSetUp || valueID == CSSValueDonate)
return true;
#if ENABLE(APPLE_PAY_SESSION_V4)
+ // check-out | book | subscribe
return valueID == CSSValueCheckOut || valueID == CSSValueBook || valueID == CSSValueSubscribe;
#else
return false;
Modified: trunk/Source/WebCore/rendering/RenderThemeCocoa.mm (236614 => 236615)
--- trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/Source/WebCore/rendering/RenderThemeCocoa.mm 2018-09-28 22:06:02 UTC (rev 236615)
@@ -114,8 +114,6 @@
return PKPaymentButtonTypeBuy;
case ApplePayButtonType::SetUp:
return PKPaymentButtonTypeSetUp;
- case ApplePayButtonType::InStore:
- return PKPaymentButtonTypeInStore;
case ApplePayButtonType::Donate:
return PKPaymentButtonTypeDonate;
#if ENABLE(APPLE_PAY_SESSION_V4)
Modified: trunk/Source/WebCore/rendering/style/RenderStyleConstants.h (236614 => 236615)
--- trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/Source/WebCore/rendering/style/RenderStyleConstants.h 2018-09-28 22:06:02 UTC (rev 236615)
@@ -1125,7 +1125,6 @@
Plain,
Buy,
SetUp,
- InStore,
Donate,
#if ENABLE(APPLE_PAY_SESSION_V4)
CheckOut,
Modified: trunk/Source/WebInspectorUI/ChangeLog (236614 => 236615)
--- trunk/Source/WebInspectorUI/ChangeLog 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/Source/WebInspectorUI/ChangeLog 2018-09-28 22:06:02 UTC (rev 236615)
@@ -1,3 +1,12 @@
+2018-09-28 Andy Estes <[email protected]>
+
+ [Apple Pay] Remove the "in-store" button type
+ https://bugs.webkit.org/show_bug.cgi?id=190079
+
+ Reviewed by Tim Horton.
+
+ * UserInterface/Models/CSSKeywordCompletions.js:
+
2018-09-28 Devin Rousso <[email protected]>
Web Inspector: image resources without content are still shown when the Images folder is selected
Modified: trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js (236614 => 236615)
--- trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2018-09-28 22:01:21 UTC (rev 236614)
+++ trunk/Source/WebInspectorUI/UserInterface/Models/CSSKeywordCompletions.js 2018-09-28 22:06:02 UTC (rev 236615)
@@ -774,7 +774,7 @@
"black", "white", "white-outline",
],
"-apple-pay-button-type": [
- "plain", "buy", "set-up", "in-store", "donate", "checkout", "book", "subscribe",
+ "plain", "buy", "set-up", "donate", "checkout", "book", "subscribe",
],
"-apple-trailing-word": [
"auto", "-webkit-partially-balanced",
