Diff
Modified: trunk/LayoutTests/ChangeLog (223052 => 223053)
--- trunk/LayoutTests/ChangeLog 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/LayoutTests/ChangeLog 2017-10-09 18:01:26 UTC (rev 223053)
@@ -1,3 +1,16 @@
+2017-10-09 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r223021.
+
+ LayoutTests added with this change are failing.
+
+ Reverted changeset:
+
+ "[Payment Request] Implement PaymentRequest.show() and
+ PaymentRequest.hide()"
+ https://bugs.webkit.org/show_bug.cgi?id=178043
+ http://trac.webkit.org/changeset/223021
+
2017-10-09 Joanmarie Diggs <[email protected]>
AX: [ATK] Explicitly-set aria-sort value of "none" should be exposed as an object attribute
Modified: trunk/LayoutTests/TestExpectations (223052 => 223053)
--- trunk/LayoutTests/TestExpectations 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/LayoutTests/TestExpectations 2017-10-09 18:01:26 UTC (rev 223053)
@@ -148,7 +148,6 @@
fast/text/font-lookup-dot-prefix-case-sensitive.html [ Skip ]
# Payment Request is only enabled on Cocoa platforms.
-http/tests/paymentrequest [ Skip ]
imported/w3c/web-platform-tests/payment-request [ Skip ]
imported/w3c/web-platform-tests/2dcontext/transformations/canvas_transformations_reset_001.html [ ImageOnlyFailure ]
Modified: trunk/LayoutTests/imported/w3c/ChangeLog (223052 => 223053)
--- trunk/LayoutTests/imported/w3c/ChangeLog 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2017-10-09 18:01:26 UTC (rev 223053)
@@ -1,3 +1,16 @@
+2017-10-09 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r223021.
+
+ LayoutTests added with this change are failing.
+
+ Reverted changeset:
+
+ "[Payment Request] Implement PaymentRequest.show() and
+ PaymentRequest.hide()"
+ https://bugs.webkit.org/show_bug.cgi?id=178043
+ http://trac.webkit.org/changeset/223021
+
2017-10-07 Darin Adler <[email protected]>
Update HTMLOListElement.start to behavior from latest HTML specification
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https-expected.txt (0 => 223053)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https-expected.txt 2017-10-09 18:01:26 UTC (rev 223053)
@@ -0,0 +1,5 @@
+
+PASS Throws if the promise [[state]] is not "interactive"
+PASS Calling abort must not change the [[state]] until after "interactive"
+FAIL calling .abort() causes acceptPromise to reject and closes the request. assert_throws: function "function () { throw e }" threw object "NotSupportedError: The operation is not supported." that is not a DOMException AbortError: property "code" is equal to 9, expected 20
+
Added: trunk/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https-expected.txt (0 => 223053)
--- trunk/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https-expected.txt (rev 0)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https-expected.txt 2017-10-09 18:01:26 UTC (rev 223053)
@@ -0,0 +1,6 @@
+
+PASS Must be possible to construct a payment request
+FAIL Throws if the promise [[state]] is not "created" assert_throws: function "function () { throw e }" threw object "NotSupportedError: The operation is not supported." that is not a DOMException AbortError: property "code" is equal to 9, expected 20
+FAIL If the user agent's "payment request is showing" boolean is true, then return a promise rejected with an "AbortError" DOMException. assert_throws: function "function () { throw e }" threw object "NotSupportedError: The operation is not supported." that is not a DOMException AbortError: property "code" is equal to 9, expected 20
+PASS If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.
+
Modified: trunk/LayoutTests/platform/ios-wk2/TestExpectations (223052 => 223053)
--- trunk/LayoutTests/platform/ios-wk2/TestExpectations 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/LayoutTests/platform/ios-wk2/TestExpectations 2017-10-09 18:01:26 UTC (rev 223053)
@@ -28,7 +28,6 @@
fast/viewport/ios/viewport-fit-cover.html [ Skip ]
fast/viewport/ios/viewport-fit-auto.html [ Skip ]
-http/tests/paymentrequest [ Pass ]
imported/w3c/web-platform-tests/payment-request [ Pass ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html [ Skip ]
@@ -35,11 +34,9 @@
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html [ Skip ]
+webkit.org/b/177391 imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ Pass Failure ]
+webkit.org/b/177391 imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ Pass Failure ]
-# skip in favor of tests in http/tests/paymentrequest
-imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ WontFix ]
-imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ WontFix ]
-
# skip manual payment-request tests
imported/w3c/web-platform-tests/payment-request/algorithms-manual.https.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/change-shipping-option-manual.https.html [ Skip ]
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (223052 => 223053)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2017-10-09 18:01:26 UTC (rev 223053)
@@ -25,8 +25,7 @@
fast/visual-viewport/rubberbanding-viewport-rects.html [ Pass ]
fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html [ Pass ]
-[ Sierra+ ] http/tests/paymentrequest [ Pass ]
-[ Sierra+ ] imported/w3c/web-platform-tests/payment-request [ Pass ]
+imported/w3c/web-platform-tests/payment-request [ Pass ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]
@@ -33,11 +32,9 @@
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html [ Skip ]
webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html [ Skip ]
webkit.org/b/177783 imported/w3c/web-platform-tests/payment-request/rejects_if_not_active.https.html [ Skip ]
+webkit.org/b/177391 imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ Pass Failure ]
+webkit.org/b/177391 imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ Pass Failure ]
-# skip in favor of tests in http/tests/paymentrequest
-imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ WontFix ]
-imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ WontFix ]
-
# skip manual payment-request tests
imported/w3c/web-platform-tests/payment-request/algorithms-manual.https.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/change-shipping-option-manual.https.html [ Skip ]
Modified: trunk/Source/WebCore/ChangeLog (223052 => 223053)
--- trunk/Source/WebCore/ChangeLog 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/ChangeLog 2017-10-09 18:01:26 UTC (rev 223053)
@@ -1,3 +1,16 @@
+2017-10-09 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r223021.
+
+ LayoutTests added with this change are failing.
+
+ Reverted changeset:
+
+ "[Payment Request] Implement PaymentRequest.show() and
+ PaymentRequest.hide()"
+ https://bugs.webkit.org/show_bug.cgi?id=178043
+ http://trac.webkit.org/changeset/223021
+
2017-10-09 Jeremy Jones <[email protected]>
Blurry captions on retina screens.
Modified: trunk/Source/WebCore/Modules/applepay/PaymentSession.h (223052 => 223053)
--- trunk/Source/WebCore/Modules/applepay/PaymentSession.h 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/Modules/applepay/PaymentSession.h 2017-10-09 18:01:26 UTC (rev 223053)
@@ -28,7 +28,7 @@
#if ENABLE(APPLE_PAY)
#include "ApplePaySessionPaymentRequest.h"
-#include "PaymentSessionBase.h"
+#include <wtf/RefCounted.h>
namespace WebCore {
@@ -37,8 +37,10 @@
class PaymentMethod;
class URL;
-class PaymentSession : public virtual PaymentSessionBase {
+class PaymentSession : public RefCounted<PaymentSession> {
public:
+ virtual ~PaymentSession() { }
+
virtual void validateMerchant(const URL&) = 0;
virtual void didAuthorizePayment(const Payment&) = 0;
virtual void didSelectShippingMethod(const ApplePaySessionPaymentRequest::ShippingMethod&) = 0;
Modified: trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp (223052 => 223053)
--- trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp 2017-10-09 18:01:26 UTC (rev 223053)
@@ -34,7 +34,6 @@
#include "Document.h"
#include "Frame.h"
#include "JSApplePayRequest.h"
-#include "LinkIconCollector.h"
#include "MainFrame.h"
#include "PaymentContact.h"
#include "PaymentCoordinator.h"
@@ -51,16 +50,6 @@
return url.host() == "apple.com" && url.path() == "/apple-pay";
}
-static inline PaymentCoordinator& paymentCoordinator(Document& document)
-{
- return document.frame()->mainFrame().paymentCoordinator();
-}
-
-bool ApplePayPaymentHandler::hasActiveSession(Document& document)
-{
- return paymentCoordinator(document).hasActiveSession();
-}
-
ApplePayPaymentHandler::ApplePayPaymentHandler(PaymentRequest& paymentRequest)
: m_paymentRequest { paymentRequest }
{
@@ -158,20 +147,11 @@
return { };
}
-void ApplePayPaymentHandler::show(Document& document)
+void ApplePayPaymentHandler::show()
{
- Vector<URL> linkIconURLs;
- for (auto& icon : LinkIconCollector { document }.iconsOfTypes({ LinkIconType::TouchIcon, LinkIconType::TouchPrecomposedIcon }))
- linkIconURLs.append(icon.url);
-
- paymentCoordinator(document).beginPaymentSession(*this, document.url(), linkIconURLs, *m_applePayRequest);
+ // FIXME: Call PaymentCoordinator::beginPaymentSession() with m_applePayRequest
}
-void ApplePayPaymentHandler::hide(Document& document)
-{
- paymentCoordinator(document).abortPaymentSession();
-}
-
} // namespace WebCore
#endif // ENABLE(APPLE_PAY) && ENABLE(PAYMENT_REQUEST)
Modified: trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.h (223052 => 223053)
--- trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.h 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.h 2017-10-09 18:01:26 UTC (rev 223053)
@@ -29,36 +29,26 @@
#include "ApplePaySessionPaymentRequest.h"
#include "PaymentHandler.h"
-#include "PaymentSession.h"
#include <wtf/Noncopyable.h>
#include <wtf/Ref.h>
namespace WebCore {
+class Document;
class PaymentRequest;
-class ApplePayPaymentHandler final : public PaymentHandler, public PaymentSession {
+class ApplePayPaymentHandler final : public PaymentHandler {
+ WTF_MAKE_NONCOPYABLE(ApplePayPaymentHandler);
public:
static bool handlesIdentifier(const PaymentRequest::MethodIdentifier&);
- static bool hasActiveSession(Document&);
private:
- friend class PaymentHandler;
+ friend std::unique_ptr<ApplePayPaymentHandler> std::make_unique<ApplePayPaymentHandler>(PaymentRequest&);
explicit ApplePayPaymentHandler(PaymentRequest&);
- // PaymentHandler
ExceptionOr<void> convertData(JSC::ExecState&, JSC::JSValue&&) final;
- void show(Document&) final;
- void hide(Document&) final;
+ void show() final;
- // PaymentSession
- void validateMerchant(const URL&) final { }
- void didAuthorizePayment(const Payment&) final { }
- void didSelectShippingMethod(const ApplePaySessionPaymentRequest::ShippingMethod&) final { }
- void didSelectShippingContact(const PaymentContact&) final { }
- void didSelectPaymentMethod(const PaymentMethod&) final { }
- void didCancelPaymentSession() final { }
-
Ref<PaymentRequest> m_paymentRequest;
std::optional<ApplePaySessionPaymentRequest> m_applePayRequest;
};
Modified: trunk/Source/WebCore/Modules/paymentrequest/PaymentHandler.cpp (223052 => 223053)
--- trunk/Source/WebCore/Modules/paymentrequest/PaymentHandler.cpp 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/Modules/paymentrequest/PaymentHandler.cpp 2017-10-09 18:01:26 UTC (rev 223053)
@@ -34,11 +34,11 @@
namespace WebCore {
-RefPtr<PaymentHandler> PaymentHandler::create(PaymentRequest& paymentRequest, const PaymentRequest::MethodIdentifier& identifier)
+std::unique_ptr<PaymentHandler> PaymentHandler::create(PaymentRequest& paymentRequest, const PaymentRequest::MethodIdentifier& identifier)
{
#if ENABLE(APPLE_PAY)
if (ApplePayPaymentHandler::handlesIdentifier(identifier))
- return adoptRef(new ApplePayPaymentHandler(paymentRequest));
+ return std::make_unique<ApplePayPaymentHandler>(paymentRequest);
#else
UNUSED_PARAM(paymentRequest);
UNUSED_PARAM(identifier);
@@ -47,16 +47,6 @@
return nullptr;
}
-bool PaymentHandler::hasActiveSession(Document& document)
-{
-#if ENABLE(APPLE_PAY)
- return ApplePayPaymentHandler::hasActiveSession(document);
-#else
- UNUSED_PARAM(document);
- return false;
-#endif
-}
-
} // namespace WebCore
#endif // ENABLE(PAYMENT_REQUEST)
Modified: trunk/Source/WebCore/Modules/paymentrequest/PaymentHandler.h (223052 => 223053)
--- trunk/Source/WebCore/Modules/paymentrequest/PaymentHandler.h 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/Modules/paymentrequest/PaymentHandler.h 2017-10-09 18:01:26 UTC (rev 223053)
@@ -28,7 +28,6 @@
#if ENABLE(PAYMENT_REQUEST)
#include "PaymentRequest.h"
-#include "PaymentSessionBase.h"
namespace JSC {
class ExecState;
@@ -37,16 +36,13 @@
namespace WebCore {
-class Document;
-
-class PaymentHandler : public virtual PaymentSessionBase {
+class PaymentHandler {
public:
- static RefPtr<PaymentHandler> create(PaymentRequest&, const PaymentRequest::MethodIdentifier&);
- static bool hasActiveSession(Document&);
+ static std::unique_ptr<PaymentHandler> create(PaymentRequest&, const PaymentRequest::MethodIdentifier&);
+ virtual ~PaymentHandler() = default;
virtual ExceptionOr<void> convertData(JSC::ExecState&, JSC::JSValue&&) = 0;
- virtual void show(Document&) = 0;
- virtual void hide(Document&) = 0;
+ virtual void show() = 0;
};
} // namespace WebCore
Modified: trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp (223052 => 223053)
--- trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp 2017-10-09 18:01:26 UTC (rev 223053)
@@ -336,7 +336,6 @@
PaymentRequest::~PaymentRequest()
{
- ASSERT(!m_activePaymentHandler);
}
// https://www.w3.org/TR/payment-request/#show()-method
@@ -350,20 +349,16 @@
return;
}
- auto& document = downcast<Document>(*scriptExecutionContext());
- if (PaymentHandler::hasActiveSession(document)) {
- promise.reject(Exception { AbortError });
- return;
- }
+ // FIXME: Reject promise with AbortError if PaymentCoordinator already has an active session.
m_state = State::Interactive;
ASSERT(!m_showPromise);
m_showPromise = WTFMove(promise);
- RefPtr<PaymentHandler> selectedPaymentHandler;
+ std::unique_ptr<PaymentHandler> selectedPaymentHandler;
for (auto& paymentMethod : m_serializedMethodData) {
- auto scope = DECLARE_THROW_SCOPE(document.vm());
- JSC::JSValue data = "" paymentMethod.serializedData);
+ auto scope = DECLARE_THROW_SCOPE(scriptExecutionContext()->vm());
+ JSC::JSValue data = "" paymentMethod.serializedData);
if (scope.exception()) {
m_showPromise->reject(Exception { ExistingExceptionError });
return;
@@ -373,7 +368,7 @@
if (!handler)
continue;
- auto result = handler->convertData(*document.execState(), WTFMove(data));
+ auto result = handler->convertData(*scriptExecutionContext()->execState(), WTFMove(data));
if (result.hasException()) {
m_showPromise->reject(result.releaseException());
return;
@@ -388,11 +383,7 @@
return;
}
- ASSERT(!m_activePaymentHandler);
- m_activePaymentHandler = WTFMove(selectedPaymentHandler);
-
- m_activePaymentHandler->show(document);
- setPendingActivity(this);
+ selectedPaymentHandler->show();
}
// https://www.w3.org/TR/payment-request/#abort()-method
@@ -401,7 +392,9 @@
if (m_state != State::Interactive)
return Exception { InvalidStateError };
- stop();
+ m_state = State::Closed;
+ ASSERT(m_showPromise);
+ m_showPromise->reject(Exception { AbortError });
promise.resolve();
return { };
}
@@ -430,33 +423,6 @@
return std::nullopt;
}
-bool PaymentRequest::canSuspendForDocumentSuspension() const
-{
- switch (m_state) {
- case State::Created:
- case State::Closed:
- ASSERT(!m_activePaymentHandler);
- return true;
- case State::Interactive:
- return !m_activePaymentHandler;
- }
-}
-
-void PaymentRequest::stop()
-{
- if (m_state != State::Interactive)
- return;
-
- if (auto paymentHandler = std::exchange(m_activePaymentHandler, nullptr)) {
- unsetPendingActivity(this);
- paymentHandler->hide(downcast<Document>(*scriptExecutionContext()));
- }
-
- ASSERT(m_state == State::Interactive);
- m_state = State::Closed;
- m_showPromise->reject(Exception { AbortError });
-}
-
} // namespace WebCore
#endif // ENABLE(PAYMENT_REQUEST)
Modified: trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.h (223052 => 223053)
--- trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.h 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/Modules/paymentrequest/PaymentRequest.h 2017-10-09 18:01:26 UTC (rev 223053)
@@ -40,7 +40,6 @@
class Document;
class PaymentAddress;
-class PaymentHandler;
class PaymentResponse;
enum class PaymentShippingType;
struct PaymentMethodData;
@@ -86,8 +85,8 @@
// ActiveDOMObject
const char* activeDOMObjectName() const final { return "PaymentRequest"; }
- bool canSuspendForDocumentSuspension() const final;
- void stop() final;
+ bool canSuspendForDocumentSuspension() const final { return true; }
+ void stop() final { }
// EventTarget
EventTargetInterface eventTargetInterface() const final { return PaymentRequestEventTargetInterfaceType; }
@@ -103,8 +102,8 @@
RefPtr<PaymentAddress> m_shippingAddress;
State m_state { State::Created };
std::optional<ShowPromise> m_showPromise;
+ std::optional<AbortPromise> m_abortPromise;
std::optional<CanMakePaymentPromise> m_canMakePaymentPromise;
- RefPtr<PaymentHandler> m_activePaymentHandler;
};
std::optional<PaymentRequest::MethodIdentifier> convertAndValidatePaymentMethodIdentifier(const String& identifier);
Deleted: trunk/Source/WebCore/Modules/paymentrequest/PaymentSessionBase.h (223052 => 223053)
--- trunk/Source/WebCore/Modules/paymentrequest/PaymentSessionBase.h 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/Modules/paymentrequest/PaymentSessionBase.h 2017-10-09 18:01:26 UTC (rev 223053)
@@ -1,40 +0,0 @@
-/*
- * Copyright (C) 2017 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(APPLE_PAY) || ENABLE(PAYMENT_REQUEST)
-
-#include <wtf/RefCounted.h>
-
-namespace WebCore {
-
-struct PaymentSessionBase : RefCounted<PaymentSessionBase> {
- virtual ~PaymentSessionBase() = default;
-};
-
-} // namespace WebCore
-
-#endif // ENABLE(APPLE_PAY) || ENABLE(PAYMENT_REQUEST)
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (223052 => 223053)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2017-10-09 18:01:26 UTC (rev 223053)
@@ -4438,7 +4438,6 @@
A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */; };
A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; };
A17D275E1EAC579800BF01E7 /* MediaSelectionOption.h in Headers */ = {isa = PBXBuildFile; fileRef = A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */; settings = {ATTRIBUTES = (Private, ); }; };
- A17FEE641F8893220021E811 /* PaymentSessionBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A17FEE631F8893220021E811 /* PaymentSessionBase.h */; };
A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = A182D5B61BE722620087A7CC /* SettingsCocoa.mm */; };
A185B4291E8211A100DC9118 /* PreviewLoader.mm in Sources */ = {isa = PBXBuildFile; fileRef = A185B4271E8211A100DC9118 /* PreviewLoader.mm */; };
A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 /* PreviewLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -12923,7 +12922,6 @@
A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; };
A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; };
A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSelectionOption.h; sourceTree = "<group>"; };
- A17FEE631F8893220021E811 /* PaymentSessionBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaymentSessionBase.h; sourceTree = "<group>"; };
A182D5B61BE722620087A7CC /* SettingsCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsCocoa.mm; sourceTree = "<group>"; };
A185B4271E8211A100DC9118 /* PreviewLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PreviewLoader.mm; sourceTree = "<group>"; };
A185B4281E8211A100DC9118 /* PreviewLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewLoader.h; sourceTree = "<group>"; };
@@ -21766,7 +21764,6 @@
A1F76B3B1F44CF240014C318 /* PaymentResponse.cpp */,
A1F76B3A1F44CF240014C318 /* PaymentResponse.h */,
A1F76B3C1F44CF240014C318 /* PaymentResponse.idl */,
- A17FEE631F8893220021E811 /* PaymentSessionBase.h */,
A1F76B521F44D2C70014C318 /* PaymentShippingOption.h */,
A1F76B541F44D2C70014C318 /* PaymentShippingOption.idl */,
A1F76B461F44D07A0014C318 /* PaymentShippingType.h */,
@@ -29661,7 +29658,6 @@
1A8A64681D19FDFF00D0E00F /* PaymentRequestValidator.h in Headers */,
A1F76B3D1F44CF240014C318 /* PaymentResponse.h in Headers */,
A1491DA31F859D870095F5D4 /* PaymentSession.h in Headers */,
- A17FEE641F8893220021E811 /* PaymentSessionBase.h in Headers */,
A1F76B551F44D2C70014C318 /* PaymentShippingOption.h in Headers */,
A1F76B491F44D07A0014C318 /* PaymentShippingType.h in Headers */,
B27535650B053814002CE64F /* PDFDocumentImage.h in Headers */,
Modified: trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm (223052 => 223053)
--- trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2017-10-09 17:56:35 UTC (rev 223052)
+++ trunk/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm 2017-10-09 18:01:26 UTC (rev 223053)
@@ -3522,8 +3522,7 @@
sub GetGnuVTableOffsetForType
{
my $typename = shift;
- if ($typename eq "ApplePaySession"
- || $typename eq "SVGAElement"
+ if ($typename eq "SVGAElement"
|| $typename eq "SVGCircleElement"
|| $typename eq "SVGClipPathElement"
|| $typename eq "SVGDefsElement"
