Attachment #323086 for bug #178043

View Details Raw Unified Return to Bug 178043

| Differences between



2017-10-06  Andy Estes  <aestes@apple.com>

        [Payment Request] Implement PaymentRequest.show() and PaymentRequest.hide()
        https://bugs.webkit.org/show_bug.cgi?id=178043

        Reviewed by NOBODY (OOPS!).

        Tests: http/tests/paymentrequest/payment-request-abort-method.https.html
               http/tests/paymentrequest/payment-request-show-method.https.html

        * Modules/applepay/PaymentSession.h: Virtually inherited from PaymentSessionBase to
        accommodate ApplePayPaymentHandler inheriting from both this and PaymentHandler.
        (WebCore::PaymentSession::~PaymentSession): Deleted.
        * Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
        (WebCore::paymentCoordinator): Virtually inherited from PaymentSessionBase to accommodate
        ApplePayPaymentHandler inheriting from both this and PaymentSession.
        (WebCore::ApplePayPaymentHandler::hasActiveSession): Added. Calls PaymentCoordinator::hasActiveSession().
        (WebCore::ApplePayPaymentHandler::show): Added. Calls PaymentCoordinator::beginPaymentSession().
        (WebCore::ApplePayPaymentHandler::hide): Added. Calls PaymentCoordinator::abortPaymentSession().
        * Modules/applepay/paymentrequest/ApplePayPaymentHandler.h: Inherited from PaymentSession in
        addition to PaymentHandler so that this can be PaymentCoordinator active session.
        * Modules/paymentrequest/PaymentHandler.cpp:
        (WebCore::PaymentHandler::create):
        (WebCore::PaymentHandler::hasActiveSession):
        * Modules/paymentrequest/PaymentHandler.h:
        * Modules/paymentrequest/PaymentRequest.cpp:
        (WebCore::PaymentRequest::~PaymentRequest):
        (WebCore::PaymentRequest::show): Rejected the promise if PaymentCoordinator has an active session.
        (WebCore::PaymentRequest::abort): Called stop().
        (WebCore::PaymentRequest::canSuspendForDocumentSuspension const): Returned true if state is
        Interactive and there is an active handler showing.
        (WebCore::PaymentRequest::stop): Hid the active session if it's showing, then set state to
        Closed and rejected the show promise.
        * Modules/paymentrequest/PaymentRequest.h:
        * Modules/paymentrequest/PaymentSessionBase.h: Added. Inherits from
        RefCounted<PaymentSessionBase> and defines a virtual destructor. This allows subclasses to
        virtually inherit a single ref-count to support multiple inheritance.
        * WebCore.xcodeproj/project.pbxproj:
        * bindings/scripts/CodeGeneratorJS.pm:
        (GetGnuVTableOffsetForType): Added ApplePaySession to the list of classes that need a vtable
        offset of 3.

2017-10-05  Zalan Bujtas  <zalan@apple.com>

        RenderMathMLFenced should not hold a raw pointer to RenderMathMLFencedOperator



#if ENABLE(APPLE_PAY)

#include "ApplePaySessionPaymentRequest.h"
#include "PaymentSessionBase.h"

namespace WebCore {


class PaymentMethod;
class URL;

class PaymentSession : public virtual PaymentSessionBase {
public:
    virtual ~PaymentSession() { }

    virtual void validateMerchant(const URL&) = 0;
    virtual void didAuthorizePayment(const Payment&) = 0;
    virtual void didSelectShippingMethod(const ApplePaySessionPaymentRequest::ShippingMethod&) = 0;

Lines 34-39 a/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp_sec1
- a/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp -2 / +22 lines
34	#include "Document.h"	34	#include "Document.h"
35	#include "Frame.h"	35	#include "Frame.h"
36	#include "JSApplePayRequest.h"	36	#include "JSApplePayRequest.h"
		37	#include "LinkIconCollector.h"
37	#include "MainFrame.h"	38	#include "MainFrame.h"
38	#include "PaymentContact.h"	39	#include "PaymentContact.h"
39	#include "PaymentCoordinator.h"	40	#include "PaymentCoordinator.h"
Lines 50-55 bool ApplePayPaymentHandler::handlesIdentifier(const PaymentRequest::MethodIdent a/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp_sec2
50	return url.host() == "apple.com" && url.path() == "/apple-pay";	51	return url.host() == "apple.com" && url.path() == "/apple-pay";
51	}	52	}
52		53
		54	static inline PaymentCoordinator& paymentCoordinator(Document& document)
		55	{
		56	return document.frame()->mainFrame().paymentCoordinator();
		57	}
		58
		59	bool ApplePayPaymentHandler::hasActiveSession(Document& document)
		60	{
		61	return paymentCoordinator(document).hasActiveSession();
		62	}
		63
53	ApplePayPaymentHandler::ApplePayPaymentHandler(PaymentRequest& paymentRequest)	64	ApplePayPaymentHandler::ApplePayPaymentHandler(PaymentRequest& paymentRequest)
54	: m_paymentRequest { paymentRequest }	65	: m_paymentRequest { paymentRequest }
55	{	66	{
Lines 147-155 ExceptionOr<void> ApplePayPaymentHandler::convertData(JSC::ExecState& execState, a/Source/WebCore/Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp_sec3
147	return { };	158	return { };
148	}	159	}
149		160
150	void ApplePayPaymentHandler::show()	161	void ApplePayPaymentHandler::show(Document& document)
		162	{
		163	Vector<URL> linkIconURLs;
		164	for (auto& icon : LinkIconCollector { document }.iconsOfTypes({ LinkIconType::TouchIcon, LinkIconType::TouchPrecomposedIcon }))
		165	linkIconURLs.append(icon.url);
		166
		167	paymentCoordinator(document).beginPaymentSession(this, document.url(), linkIconURLs, m_applePayRequest);
		168	}
		169
		170	void ApplePayPaymentHandler::hide(Document& document)
151	{	171	{
152	// FIXME: Call PaymentCoordinator::beginPaymentSession() with m_applePayRequest	172	paymentCoordinator(document).abortPaymentSession();
153	}	173	}
154		174
155	} // namespace WebCore	175	} // namespace WebCore




#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 {
    WTF_MAKE_NONCOPYABLE(ApplePayPaymentHandler);
public:
    static bool handlesIdentifier(const PaymentRequest::MethodIdentifier&);
    static bool hasActiveSession(Document&);

private:
    friend class PaymentHandler;
    explicit ApplePayPaymentHandler(PaymentRequest&);

    // PaymentHandler
    ExceptionOr<void> convertData(JSC::ExecState&, JSC::JSValue&&) final;
    void show(Document&) final;
    void hide(Document&) 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;




namespace WebCore {

RefPtr<PaymentHandler> PaymentHandler::create(PaymentRequest& paymentRequest, const PaymentRequest::MethodIdentifier& identifier)
{
#if ENABLE(APPLE_PAY)
    if (ApplePayPaymentHandler::handlesIdentifier(identifier))
        return adoptRef(new ApplePayPaymentHandler(paymentRequest));
#else
    UNUSED_PARAM(paymentRequest);
    UNUSED_PARAM(identifier);

    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)



#if ENABLE(PAYMENT_REQUEST)

#include "PaymentRequest.h"
#include "PaymentSessionBase.h"

namespace JSC {
class ExecState;


namespace WebCore {

class Document;

class PaymentHandler : public virtual PaymentSessionBase {
public:
    static RefPtr<PaymentHandler> create(PaymentRequest&, const PaymentRequest::MethodIdentifier&);
    static bool hasActiveSession(Document&);

    virtual ExceptionOr<void> convertData(JSC::ExecState&, JSC::JSValue&&) = 0;
    virtual void show(Document&) = 0;
    virtual void hide(Document&) = 0;
};

} // namespace WebCore




PaymentRequest::~PaymentRequest()
{
    ASSERT(!m_activePaymentHandler);
}

// https://www.w3.org/TR/payment-request/#show()-method

        return;
    }

    auto& document = downcast<Document>(*scriptExecutionContext());
    if (PaymentHandler::hasActiveSession(document)) {
        promise.reject(Exception { AbortError });
        return;
    }

    m_state = State::Interactive;
    ASSERT(!m_showPromise);
    m_showPromise = WTFMove(promise);

    RefPtr<PaymentHandler> selectedPaymentHandler;
    for (auto& paymentMethod : m_serializedMethodData) {
        auto scope = DECLARE_THROW_SCOPE(document.vm());
        JSC::JSValue data = JSONParse(document.execState(), paymentMethod.serializedData);
        if (scope.exception()) {
            m_showPromise->reject(Exception { ExistingExceptionError });
            return;

        if (!handler)
            continue;

        auto result = handler->convertData(*document.execState(), WTFMove(data));
        if (result.hasException()) {
            m_showPromise->reject(result.releaseException());
            return;

        return;
    }

    ASSERT(!m_activePaymentHandler);
    m_activePaymentHandler = WTFMove(selectedPaymentHandler);

    m_activePaymentHandler->show(document);
    setPendingActivity(this);
}

// https://www.w3.org/TR/payment-request/#abort()-method

    if (m_state != State::Interactive)
        return Exception { InvalidStateError };

    stop();
    ASSERT(m_showPromise);
    m_showPromise->reject(Exception { AbortError });
    promise.resolve();
    return { };
}

    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)




class Document;
class PaymentAddress;
class PaymentHandler;
class PaymentResponse;
enum class PaymentShippingType;
struct PaymentMethodData;


    // ActiveDOMObject
    const char* activeDOMObjectName() const final { return "PaymentRequest"; }
    bool canSuspendForDocumentSuspension() const final;
    void stop() final;

    // EventTarget
    EventTargetInterface eventTargetInterface() const final { return PaymentRequestEventTargetInterfaceType; }

    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);



/*
 * 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)



		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, ); }; };

		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>"; };

				A1F76B3B1F44CF240014C318 /* PaymentResponse.cpp */,
				A1F76B3A1F44CF240014C318 /* PaymentResponse.h */,
				A1F76B3C1F44CF240014C318 /* PaymentResponse.idl */,
				A17FEE631F8893220021E811 /* PaymentSessionBase.h */,
				A1F76B521F44D2C70014C318 /* PaymentShippingOption.h */,
				A1F76B541F44D2C70014C318 /* PaymentShippingOption.idl */,
				A1F76B461F44D07A0014C318 /* PaymentShippingType.h */,

				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 */,



sub GetGnuVTableOffsetForType
{
    my $typename = shift;
    if ($typename eq "ApplePaySession"
        || $typename eq "SVGAElement"
        || $typename eq "SVGCircleElement"
        || $typename eq "SVGClipPathElement"
        || $typename eq "SVGDefsElement"



2017-10-06  Andy Estes  <aestes@apple.com>

        [Payment Request] Implement PaymentRequest.show() and PaymentRequest.hide()
        https://bugs.webkit.org/show_bug.cgi?id=178043

        Reviewed by NOBODY (OOPS!).

        Copied payment-request-abort-method.https.html and payment-request-show-method.https.html
        from web-platform-tests/payment-request/ and changed the payment method from basic-card to
        Apple Pay. This needs to eventually be upstreamed back to WPT.

        * http/tests/paymentrequest/payment-request-abort-method.https-expected.txt: Added.
        * http/tests/paymentrequest/payment-request-abort-method.https.html: Added.
        * http/tests/paymentrequest/payment-request-show-method.https-expected.txt: Added.
        * http/tests/paymentrequest/payment-request-show-method.https.html: Added.
        * platform/ios-wk2/TestExpectations:
        * platform/mac-wk2/TestExpectations:

2017-10-05  Andy Estes  <aestes@apple.com>

        [Payment Request] Add a payment method that supports Apple Pay



2017-10-06  Andy Estes  <aestes@apple.com>

        [Payment Request] Implement PaymentRequest.show() and PaymentRequest.hide()
        https://bugs.webkit.org/show_bug.cgi?id=178043

        Reviewed by NOBODY (OOPS!).

        * web-platform-tests/payment-request/payment-request-abort-method.https-expected.txt: Removed.
        * web-platform-tests/payment-request/payment-request-show-method.https-expected.txt: Removed.

2017-10-05  Andy Estes  <aestes@apple.com>

        [Payment Request] Add a payment method that supports Apple Pay

Line 0 a/LayoutTests/http/tests/paymentrequest/payment-request-abort-method.https-expected.txt_sec1
- a/LayoutTests/http/tests/paymentrequest/payment-request-abort-method.https-expected.txt +5 lines
	1
	2	PASS Throws if the promise [[state]] is not "interactive"
	3	PASS Calling abort must not change the [[state]] until after "interactive"
	4	PASS calling .abort() causes acceptPromise to reject and closes the request.
	5



<!DOCTYPE html>
<!--  Copyright © 2017 Chromium authors and World Wide Web Consortium, (Massachusetts Institute of Technology, ERCIM, Keio University, Beihang).  -->
<!--  Copyright (C) 2017 Apple Inc. All rights reserved.  -->
<!-- FIXME: Upstream this test to web-platform-tests/payment-request/. -->
<meta charset="utf-8">
<title>Test for PaymentRequest.abort() method</title>
<link rel="help" href="https://w3c.github.io/browser-payment-api/#abort-method">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
"use strict";
setup(() => {}, {
  // Ignore unhandled rejections resulting from .show()'s acceptPromise
  // not being explicitly handled.
  allow_uncaught_exception: true,
});
const applePay = Object.freeze({
    supportedMethods: "https://apple.com/apple-pay",
    data: {
        version: 2,
        merchantCapabilities: ['supports3DS'],
        supportedNetworks: ['visa', 'masterCard'],
        countryCode: 'US',
        currencyCode: 'USD',
    },
});
const defaultMethods = Object.freeze([applePay]);
const defaultDetails = Object.freeze({
  total: {
    label: "Total",
    amount: {
      currency: "USD",
      value: "1.00",
    },
  },
});

promise_test(async t => {
  // request is in "created" state
  const request = new PaymentRequest(defaultMethods, defaultDetails);
  await promise_rejects(t, "InvalidStateError", request.abort());
}, `Throws if the promise [[state]] is not "interactive"`);

promise_test(async t => {
  // request is in "created" state.
  const request = new PaymentRequest(defaultMethods, defaultDetails);
  await promise_rejects(t, "InvalidStateError", request.abort());
  // Call it again, for good measure.
  await promise_rejects(t, "InvalidStateError", request.abort());
  // The request's state is "created", so let's show it
  // which changes the state to "interactive.".
  request.show();
  // Let's set request the state to "closed" by calling .abort()
  try {
    await request.abort();
  } catch (err) {
    assert_true(false, "Unexpected promise rejection: " + err.message);
  }
  // The request is now "closed", so...
  await promise_rejects(t, "InvalidStateError", request.abort());
}, `Calling abort must not change the [[state]] until after "interactive"`);

promise_test(async t => {
  const request = new PaymentRequest(defaultMethods, defaultDetails);
  const acceptPromise = request.show();
  try {
    await request.abort();
  } catch (err) {
    assert_true(false, "Unexpected promise rejection: " + err.message);
  }
  await promise_rejects(t, "AbortError", acceptPromise);
  // As request is now "closed", trying to show it will fail
  await promise_rejects(t, "InvalidStateError", request.show());
}, "calling .abort() causes acceptPromise to reject and closes the request.");

</script>

Line 0 a/LayoutTests/http/tests/paymentrequest/payment-request-show-method.https-expected.txt_sec1
- a/LayoutTests/http/tests/paymentrequest/payment-request-show-method.https-expected.txt +6 lines
	1
	2	PASS Must be possible to construct a payment request
	3	PASS Throws if the promise [[state]] is not "created"
	4	PASS If the user agent's "payment request is showing" boolean is true, then return a promise rejected with an "AbortError" DOMException.
	5	PASS If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.
	6



<!DOCTYPE html>
<!--  Copyright © 2017 Chromium authors and World Wide Web Consortium, (Massachusetts Institute of Technology, ERCIM, Keio University, Beihang).  -->
<!--  Copyright (C) 2017 Apple Inc. All rights reserved.  -->
<!-- FIXME: Upstream this test to web-platform-tests/payment-request/. -->
<meta charset="utf-8">
<title>Test for PaymentRequest.show() method</title>
<link rel="help" href="https://w3c.github.io/browser-payment-api/#show-method">
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<script>
'use strict';
const applePay = Object.freeze({
    supportedMethods: "https://apple.com/apple-pay",
    data: {
        version: 2,
        merchantCapabilities: ['supports3DS'],
        supportedNetworks: ['visa', 'masterCard'],
        countryCode: 'US',
        currencyCode: 'USD',
    },
});
const defaultMethods = Object.freeze([applePay]);
const defaultDetails = Object.freeze({
  total: {
    label: "Total",
    amount: {
      currency: "USD",
      value: "1.00",
    },
  },
});

test(() => {
  try {
    new PaymentRequest(defaultMethods, defaultDetails);
  } catch (err) {
    done();
    throw err;
  }
}, "Must be possible to construct a payment request");


promise_test(async t => {
  const request = new PaymentRequest(defaultMethods, defaultDetails);
  const acceptPromise = request.show(); // Sets state to "interactive"
  await promise_rejects(t, "InvalidStateError", request.show());
  await request.abort();
  await promise_rejects(t, "AbortError", acceptPromise);
}, `Throws if the promise [[state]] is not "created"`);

promise_test(async t => {
  const request1 = new PaymentRequest(defaultMethods, defaultDetails);
  const request2 = new PaymentRequest(defaultMethods, defaultDetails);
  const acceptPromise1 = request1.show();
  const acceptPromise2 = request2.show();
  await promise_rejects(t, "AbortError", acceptPromise2);
  await request1.abort();
  await promise_rejects(t, "AbortError", acceptPromise1);
}, `If the user agent's "payment request is showing" boolean is true, then return a promise rejected with an "AbortError" DOMException.`);

promise_test(async t => {
  const request = new PaymentRequest(
    [{ supportedMethods: "this-is-not-supported" }],
    defaultDetails);
  const acceptPromise = request.show();
  await promise_rejects(t, "NotSupportedError", acceptPromise);
}, `If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.`);
</script>

Lines 1-5 a/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https-expected.txt -5 lines
1
2	PASS Throws if the promise [[state]] is not "interactive"
3	PASS Calling abort must not change the [[state]] until after "interactive"
4	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
5

Lines 1-6 a/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https-expected.txt_sec1
- a/LayoutTests/imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https-expected.txt -6 lines
1
2	PASS Must be possible to construct a payment request
3	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
4	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
5	PASS If payment method consultation produces no supported method of payment, then return a promise rejected with a "NotSupportedError" DOMException.
6



fast/viewport/ios/viewport-fit-cover.html [ Skip ]
fast/viewport/ios/viewport-fit-auto.html [ Skip ]

[ Sierra+ ] http/tests/paymentrequest [ Pass ]
[ Sierra+ ] 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 ]
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 ]

# skip in favor of tests in http/tests/paymentrequest
imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ Skip ]

 # skip manual payment-request tests
imported/w3c/web-platform-tests/payment-request/algorithms-manual.https.html [ Skip ]



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 ]
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 ]
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 ]

# skip in favor of tests in http/tests/paymentrequest
imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ Skip ]
imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ Skip ]

# skip manual payment-request tests
imported/w3c/web-platform-tests/payment-request/algorithms-manual.https.html [ Skip ]

Return to Bug 178043

Lines 336-341 PaymentRequest::PaymentRequest(Document& document, PaymentOptions&& options, Pay a/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp_sec1
- a/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp -9 / +43 lines
336		336
337	PaymentRequest::~PaymentRequest()	337	PaymentRequest::~PaymentRequest()
338	{	338	{
		339	ASSERT(!m_activePaymentHandler);
339	}	340	}
340		341
341	// https://www.w3.org/TR/payment-request/#show()-method	342	// https://www.w3.org/TR/payment-request/#show()-method
Lines 349-364 void PaymentRequest::show(ShowPromise&& promise) a/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp_sec2
349	return;	350	return;
350	}	351	}
351		352
352	// FIXME: Reject promise with AbortError if PaymentCoordinator already has an active session.	353	auto& document = downcast<Document>(*scriptExecutionContext());
		354	if (PaymentHandler::hasActiveSession(document)) {
		355	promise.reject(Exception { AbortError });
		356	return;
		357	}
353		358
354	m_state = State::Interactive;	359	m_state = State::Interactive;
355	ASSERT(!m_showPromise);	360	ASSERT(!m_showPromise);
356	m_showPromise = WTFMove(promise);	361	m_showPromise = WTFMove(promise);
357		362
358	std::unique_ptr<PaymentHandler> selectedPaymentHandler;	363	RefPtr<PaymentHandler> selectedPaymentHandler;
359	for (auto& paymentMethod : m_serializedMethodData) {	364	for (auto& paymentMethod : m_serializedMethodData) {
360	auto scope = DECLARE_THROW_SCOPE(scriptExecutionContext()->vm());	365	auto scope = DECLARE_THROW_SCOPE(document.vm());
361	JSC::JSValue data = JSONParse(scriptExecutionContext()->execState(), paymentMethod.serializedData);	366	JSC::JSValue data = JSONParse(document.execState(), paymentMethod.serializedData);
362	if (scope.exception()) {	367	if (scope.exception()) {
363	m_showPromise->reject(Exception { ExistingExceptionError });	368	m_showPromise->reject(Exception { ExistingExceptionError });
364	return;	369	return;
Lines 368-374 void PaymentRequest::show(ShowPromise&& promise) a/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp_sec3
368	if (!handler)	373	if (!handler)
369	continue;	374	continue;
370		375
371	auto result = handler->convertData(*scriptExecutionContext()->execState(), WTFMove(data));	376	auto result = handler->convertData(*document.execState(), WTFMove(data));
372	if (result.hasException()) {	377	if (result.hasException()) {
373	m_showPromise->reject(result.releaseException());	378	m_showPromise->reject(result.releaseException());
374	return;	379	return;
Lines 383-389 void PaymentRequest::show(ShowPromise&& promise) a/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp_sec4
383	return;	388	return;
384	}	389	}
385		390
386	selectedPaymentHandler->show();	391	ASSERT(!m_activePaymentHandler);
		392	m_activePaymentHandler = WTFMove(selectedPaymentHandler);
		393
		394	m_activePaymentHandler->show(document);
		395	setPendingActivity(this);
387	}	396	}
388		397
389	// https://www.w3.org/TR/payment-request/#abort()-method	398	// https://www.w3.org/TR/payment-request/#abort()-method
Lines 392-400 ExceptionOr<void> PaymentRequest::abort(AbortPromise&& promise) a/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp_sec5
392	if (m_state != State::Interactive)	401	if (m_state != State::Interactive)
393	return Exception { InvalidStateError };	402	return Exception { InvalidStateError };
394		403
395	m_state = State::Closed;	404	stop();
396	ASSERT(m_showPromise);
397	m_showPromise->reject(Exception { AbortError });
398	promise.resolve();	405	promise.resolve();
399	return { };	406	return { };
400	}	407	}
Lines 423-428 std::optional<PaymentShippingType> PaymentRequest::shippingType() const a/Source/WebCore/Modules/paymentrequest/PaymentRequest.cpp_sec6
423	return std::nullopt;	430	return std::nullopt;
424	}	431	}
425		432
		433	bool PaymentRequest::canSuspendForDocumentSuspension() const
		434	{
		435	switch (m_state) {
		436	case State::Created:
		437	case State::Closed:
		438	ASSERT(!m_activePaymentHandler);
		439	return true;
		440	case State::Interactive:
		441	return !m_activePaymentHandler;
		442	}
		443	}
		444
		445	void PaymentRequest::stop()
		446	{
		447	if (m_state != State::Interactive)
		448	return;
		449
		450	if (auto paymentHandler = std::exchange(m_activePaymentHandler, nullptr)) {
		451	unsetPendingActivity(this);
		452	paymentHandler->hide(downcast<Document>(*scriptExecutionContext()));
		453	}
		454
		455	ASSERT(m_state == State::Interactive);
		456	m_state = State::Closed;
		457	m_showPromise->reject(Exception { AbortError });
		458	}
		459
426	} // namespace WebCore	460	} // namespace WebCore
427		461
428	#endif // ENABLE(PAYMENT_REQUEST)	462	#endif // ENABLE(PAYMENT_REQUEST)

Lines 3522-3528 sub GetGnuMangledNameForInterface a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm_sec1
- a/Source/WebCore/bindings/scripts/CodeGeneratorJS.pm -1 / +2 lines
3522	sub GetGnuVTableOffsetForType	3522	sub GetGnuVTableOffsetForType
3523	{	3523	{
3524	my $typename = shift;	3524	my $typename = shift;
3525	if ($typename eq "SVGAElement"	3525	if ($typename eq "ApplePaySession"
		3526	\|\| $typename eq "SVGAElement"
3526	\|\| $typename eq "SVGCircleElement"	3527	\|\| $typename eq "SVGCircleElement"
3527	\|\| $typename eq "SVGClipPathElement"	3528	\|\| $typename eq "SVGClipPathElement"
3528	\|\| $typename eq "SVGDefsElement"	3529	\|\| $typename eq "SVGDefsElement"

Lines 1-3 a/Source/WebCore/ChangeLog_sec1
- a/Source/WebCore/ChangeLog +42 lines
		1	2017-10-06 Andy Estes <aestes@apple.com>
		2
		3	[Payment Request] Implement PaymentRequest.show() and PaymentRequest.hide()
		4	https://bugs.webkit.org/show_bug.cgi?id=178043
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Tests: http/tests/paymentrequest/payment-request-abort-method.https.html
		9	http/tests/paymentrequest/payment-request-show-method.https.html
		10
		11	* Modules/applepay/PaymentSession.h: Virtually inherited from PaymentSessionBase to
		12	accommodate ApplePayPaymentHandler inheriting from both this and PaymentHandler.
		13	(WebCore::PaymentSession::~PaymentSession): Deleted.
		14	* Modules/applepay/paymentrequest/ApplePayPaymentHandler.cpp:
		15	(WebCore::paymentCoordinator): Virtually inherited from PaymentSessionBase to accommodate
		16	ApplePayPaymentHandler inheriting from both this and PaymentSession.
		17	(WebCore::ApplePayPaymentHandler::hasActiveSession): Added. Calls PaymentCoordinator::hasActiveSession().
		18	(WebCore::ApplePayPaymentHandler::show): Added. Calls PaymentCoordinator::beginPaymentSession().
		19	(WebCore::ApplePayPaymentHandler::hide): Added. Calls PaymentCoordinator::abortPaymentSession().
		20	* Modules/applepay/paymentrequest/ApplePayPaymentHandler.h: Inherited from PaymentSession in
		21	addition to PaymentHandler so that this can be PaymentCoordinator active session.
		22	* Modules/paymentrequest/PaymentHandler.cpp:
		23	(WebCore::PaymentHandler::create):
		24	(WebCore::PaymentHandler::hasActiveSession):
		25	* Modules/paymentrequest/PaymentHandler.h:
		26	* Modules/paymentrequest/PaymentRequest.cpp:
		27	(WebCore::PaymentRequest::~PaymentRequest):
		28	(WebCore::PaymentRequest::show): Rejected the promise if PaymentCoordinator has an active session.
		29	(WebCore::PaymentRequest::abort): Called stop().
		30	(WebCore::PaymentRequest::canSuspendForDocumentSuspension const): Returned true if state is
		31	Interactive and there is an active handler showing.
		32	(WebCore::PaymentRequest::stop): Hid the active session if it's showing, then set state to
		33	Closed and rejected the show promise.
		34	* Modules/paymentrequest/PaymentRequest.h:
		35	* Modules/paymentrequest/PaymentSessionBase.h: Added. Inherits from
		36	RefCounted<PaymentSessionBase> and defines a virtual destructor. This allows subclasses to
		37	virtually inherit a single ref-count to support multiple inheritance.
		38	* WebCore.xcodeproj/project.pbxproj:
		39	* bindings/scripts/CodeGeneratorJS.pm:
		40	(GetGnuVTableOffsetForType): Added ApplePaySession to the list of classes that need a vtable
		41	offset of 3.
		42
1	2017-10-05 Zalan Bujtas <zalan@apple.com>	43	2017-10-05 Zalan Bujtas <zalan@apple.com>
2		44
3	RenderMathMLFenced should not hold a raw pointer to RenderMathMLFencedOperator	45	RenderMathMLFenced should not hold a raw pointer to RenderMathMLFencedOperator

Lines 28-34 a/Source/WebCore/Modules/applepay/PaymentSession.h_sec1
- a/Source/WebCore/Modules/applepay/PaymentSession.h -4 / +2 lines
28	#if ENABLE(APPLE_PAY)	28	#if ENABLE(APPLE_PAY)
29		29
30	#include "ApplePaySessionPaymentRequest.h"	30	#include "ApplePaySessionPaymentRequest.h"
31	#include <wtf/RefCounted.h>	31	#include "PaymentSessionBase.h"
32		32
33	namespace WebCore {	33	namespace WebCore {
34		34
Lines 37-46 class PaymentContact; a/Source/WebCore/Modules/applepay/PaymentSession.h_sec2
37	class PaymentMethod;	37	class PaymentMethod;
38	class URL;	38	class URL;
39		39
40	class PaymentSession : public RefCounted<PaymentSession> {	40	class PaymentSession : public virtual PaymentSessionBase {
41	public:	41	public:
42	virtual ~PaymentSession() { }
43
44	virtual void validateMerchant(const URL&) = 0;	42	virtual void validateMerchant(const URL&) = 0;
45	virtual void didAuthorizePayment(const Payment&) = 0;	43	virtual void didAuthorizePayment(const Payment&) = 0;
46	virtual void didSelectShippingMethod(const ApplePaySessionPaymentRequest::ShippingMethod&) = 0;	44	virtual void didSelectShippingMethod(const ApplePaySessionPaymentRequest::ShippingMethod&) = 0;

Lines 28-33 a/Source/WebCore/Modules/paymentrequest/PaymentHandler.h_sec1
- a/Source/WebCore/Modules/paymentrequest/PaymentHandler.h -4 / +8 lines
28	#if ENABLE(PAYMENT_REQUEST)	28	#if ENABLE(PAYMENT_REQUEST)
29		29
30	#include "PaymentRequest.h"	30	#include "PaymentRequest.h"
		31	#include "PaymentSessionBase.h"
31		32
32	namespace JSC {	33	namespace JSC {
33	class ExecState;	34	class ExecState;
Lines 36-48 class JSValue; a/Source/WebCore/Modules/paymentrequest/PaymentHandler.h_sec2
36		37
37	namespace WebCore {	38	namespace WebCore {
38		39
39	class PaymentHandler {	40	class Document;
		41
		42	class PaymentHandler : public virtual PaymentSessionBase {
40	public:	43	public:
41	static std::unique_ptr<PaymentHandler> create(PaymentRequest&, const PaymentRequest::MethodIdentifier&);	44	static RefPtr<PaymentHandler> create(PaymentRequest&, const PaymentRequest::MethodIdentifier&);
42	virtual ~PaymentHandler() = default;	45	static bool hasActiveSession(Document&);
43		46
44	virtual ExceptionOr<void> convertData(JSC::ExecState&, JSC::JSValue&&) = 0;	47	virtual ExceptionOr<void> convertData(JSC::ExecState&, JSC::JSValue&&) = 0;
45	virtual void show() = 0;	48	virtual void show(Document&) = 0;
		49	virtual void hide(Document&) = 0;
46	};	50	};
47		51
48	} // namespace WebCore	52	} // namespace WebCore

Line 0 a/Source/WebCore/Modules/paymentrequest/PaymentSessionBase.h_sec1
- a/Source/WebCore/Modules/paymentrequest/PaymentSessionBase.h +40 lines
	1	/*
	2	* Copyright (C) 2017 Apple Inc. All rights reserved.
	3	*
	4	* Redistribution and use in source and binary forms, with or without
	5	* modification, are permitted provided that the following conditions
	6	* are met:
	7	* 1. Redistributions of source code must retain the above copyright
	8	* notice, this list of conditions and the following disclaimer.
	9	* 2. Redistributions in binary form must reproduce the above copyright
	10	* notice, this list of conditions and the following disclaimer in the
	11	* documentation and/or other materials provided with the distribution.
	12	*
	13	* THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
	14	* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
	15	* THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
	16	* PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
	17	* BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
	18	* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
	19	* SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
	20	* INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
	21	* CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
	22	* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
	23	* THE POSSIBILITY OF SUCH DAMAGE.
	24	*/
	25
	26	#pragma once
	27
	28	#if ENABLE(APPLE_PAY) \|\| ENABLE(PAYMENT_REQUEST)
	29
	30	#include <wtf/RefCounted.h>
	31
	32	namespace WebCore {
	33
	34	struct PaymentSessionBase : RefCounted<PaymentSessionBase> {
	35	virtual ~PaymentSessionBase() = default;
	36	};
	37
	38	} // namespace WebCore
	39
	40	#endif // ENABLE(APPLE_PAY) \|\| ENABLE(PAYMENT_REQUEST)

Lines 4427-4432 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec1
- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj +4 lines
4427	A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources / = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB / HTMLElementFactory.cpp */; };	4427	A17C81220F2A5CF7005DAAEB /* HTMLElementFactory.cpp in Sources / = {isa = PBXBuildFile; fileRef = A17C81200F2A5CF7005DAAEB / HTMLElementFactory.cpp */; };
4428	A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers / = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB / HTMLElementFactory.h */; };	4428	A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers / = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB / HTMLElementFactory.h */; };
4429	A17D275E1EAC579800BF01E7 /* MediaSelectionOption.h in Headers / = {isa = PBXBuildFile; fileRef = A17D275D1EAC579800BF01E7 / MediaSelectionOption.h */; settings = {ATTRIBUTES = (Private, ); }; };	4429	A17D275E1EAC579800BF01E7 /* MediaSelectionOption.h in Headers / = {isa = PBXBuildFile; fileRef = A17D275D1EAC579800BF01E7 / MediaSelectionOption.h */; settings = {ATTRIBUTES = (Private, ); }; };
		4430	A17FEE641F8893220021E811 /* PaymentSessionBase.h in Headers / = {isa = PBXBuildFile; fileRef = A17FEE631F8893220021E811 / PaymentSessionBase.h */; };
4430	A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources / = {isa = PBXBuildFile; fileRef = A182D5B61BE722620087A7CC / SettingsCocoa.mm */; };	4431	A182D5B71BE722670087A7CC /* SettingsCocoa.mm in Sources / = {isa = PBXBuildFile; fileRef = A182D5B61BE722620087A7CC / SettingsCocoa.mm */; };
4431	A185B4291E8211A100DC9118 /* PreviewLoader.mm in Sources / = {isa = PBXBuildFile; fileRef = A185B4271E8211A100DC9118 / PreviewLoader.mm */; };	4432	A185B4291E8211A100DC9118 /* PreviewLoader.mm in Sources / = {isa = PBXBuildFile; fileRef = A185B4271E8211A100DC9118 / PreviewLoader.mm */; };
4432	A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers / = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 / PreviewLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };	4433	A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers / = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 / PreviewLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
Lines 12892-12897 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec2
12892	A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; };	12893	A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = HTMLElementFactory.cpp; sourceTree = "<group>"; };
12893	A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; };	12894	A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HTMLElementFactory.h; sourceTree = "<group>"; };
12894	A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSelectionOption.h; sourceTree = "<group>"; };	12895	A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSelectionOption.h; sourceTree = "<group>"; };
		12896	A17FEE631F8893220021E811 /* PaymentSessionBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaymentSessionBase.h; sourceTree = "<group>"; };
12895	A182D5B61BE722620087A7CC /* SettingsCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsCocoa.mm; sourceTree = "<group>"; };	12897	A182D5B61BE722620087A7CC /* SettingsCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsCocoa.mm; sourceTree = "<group>"; };
12896	A185B4271E8211A100DC9118 /* PreviewLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PreviewLoader.mm; sourceTree = "<group>"; };	12898	A185B4271E8211A100DC9118 /* PreviewLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PreviewLoader.mm; sourceTree = "<group>"; };
12897	A185B4281E8211A100DC9118 /* PreviewLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewLoader.h; sourceTree = "<group>"; };	12899	A185B4281E8211A100DC9118 /* PreviewLoader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PreviewLoader.h; sourceTree = "<group>"; };
Lines 21711-21716 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec3
21711	A1F76B3B1F44CF240014C318 /* PaymentResponse.cpp */,	21713	A1F76B3B1F44CF240014C318 /* PaymentResponse.cpp */,
21712	A1F76B3A1F44CF240014C318 /* PaymentResponse.h */,	21714	A1F76B3A1F44CF240014C318 /* PaymentResponse.h */,
21713	A1F76B3C1F44CF240014C318 /* PaymentResponse.idl */,	21715	A1F76B3C1F44CF240014C318 /* PaymentResponse.idl */,
		21716	A17FEE631F8893220021E811 /* PaymentSessionBase.h */,
21714	A1F76B521F44D2C70014C318 /* PaymentShippingOption.h */,	21717	A1F76B521F44D2C70014C318 /* PaymentShippingOption.h */,
21715	A1F76B541F44D2C70014C318 /* PaymentShippingOption.idl */,	21718	A1F76B541F44D2C70014C318 /* PaymentShippingOption.idl */,
21716	A1F76B461F44D07A0014C318 /* PaymentShippingType.h */,	21719	A1F76B461F44D07A0014C318 /* PaymentShippingType.h */,
Lines 29566-29571 a/Source/WebCore/WebCore.xcodeproj/project.pbxproj_sec4
29566	1A8A64681D19FDFF00D0E00F /* PaymentRequestValidator.h in Headers */,	29569	1A8A64681D19FDFF00D0E00F /* PaymentRequestValidator.h in Headers */,
29567	A1F76B3D1F44CF240014C318 /* PaymentResponse.h in Headers */,	29570	A1F76B3D1F44CF240014C318 /* PaymentResponse.h in Headers */,
29568	A1491DA31F859D870095F5D4 /* PaymentSession.h in Headers */,	29571	A1491DA31F859D870095F5D4 /* PaymentSession.h in Headers */,
		29572	A17FEE641F8893220021E811 /* PaymentSessionBase.h in Headers */,
29569	A1F76B551F44D2C70014C318 /* PaymentShippingOption.h in Headers */,	29573	A1F76B551F44D2C70014C318 /* PaymentShippingOption.h in Headers */,
29570	A1F76B491F44D07A0014C318 /* PaymentShippingType.h in Headers */,	29574	A1F76B491F44D07A0014C318 /* PaymentShippingType.h in Headers */,
29571	B27535650B053814002CE64F /* PDFDocumentImage.h in Headers */,	29575	B27535650B053814002CE64F /* PDFDocumentImage.h in Headers */,

Lines 1-3 a/LayoutTests/ChangeLog_sec1
- a/LayoutTests/ChangeLog +18 lines
		1	2017-10-06 Andy Estes <aestes@apple.com>
		2
		3	[Payment Request] Implement PaymentRequest.show() and PaymentRequest.hide()
		4	https://bugs.webkit.org/show_bug.cgi?id=178043
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	Copied payment-request-abort-method.https.html and payment-request-show-method.https.html
		9	from web-platform-tests/payment-request/ and changed the payment method from basic-card to
		10	Apple Pay. This needs to eventually be upstreamed back to WPT.
		11
		12	* http/tests/paymentrequest/payment-request-abort-method.https-expected.txt: Added.
		13	* http/tests/paymentrequest/payment-request-abort-method.https.html: Added.
		14	* http/tests/paymentrequest/payment-request-show-method.https-expected.txt: Added.
		15	* http/tests/paymentrequest/payment-request-show-method.https.html: Added.
		16	* platform/ios-wk2/TestExpectations:
		17	* platform/mac-wk2/TestExpectations:
		18
1	2017-10-05 Andy Estes <aestes@apple.com>	19	2017-10-05 Andy Estes <aestes@apple.com>
2		20
3	[Payment Request] Add a payment method that supports Apple Pay	21	[Payment Request] Add a payment method that supports Apple Pay

Lines 1-3 a/LayoutTests/imported/w3c/ChangeLog_sec1
- a/LayoutTests/imported/w3c/ChangeLog +10 lines
		1	2017-10-06 Andy Estes <aestes@apple.com>
		2
		3	[Payment Request] Implement PaymentRequest.show() and PaymentRequest.hide()
		4	https://bugs.webkit.org/show_bug.cgi?id=178043
		5
		6	Reviewed by NOBODY (OOPS!).
		7
		8	* web-platform-tests/payment-request/payment-request-abort-method.https-expected.txt: Removed.
		9	* web-platform-tests/payment-request/payment-request-show-method.https-expected.txt: Removed.
		10
1	2017-10-05 Andy Estes <aestes@apple.com>	11	2017-10-05 Andy Estes <aestes@apple.com>
2		12
3	[Payment Request] Add a payment method that supports Apple Pay	13	[Payment Request] Add a payment method that supports Apple Pay

Line 0 a/LayoutTests/http/tests/paymentrequest/payment-request-abort-method.https.html_sec1
- a/LayoutTests/http/tests/paymentrequest/payment-request-abort-method.https.html +76 lines
		1	<!DOCTYPE html>
		2	<!-- Copyright © 2017 Chromium authors and World Wide Web Consortium, (Massachusetts Institute of Technology, ERCIM, Keio University, Beihang). -->
		3	<!-- Copyright (C) 2017 Apple Inc. All rights reserved. -->
		4	<!-- FIXME: Upstream this test to web-platform-tests/payment-request/. -->
		5	<meta charset="utf-8">
		6	<title>Test for PaymentRequest.abort() method</title>
		7	<link rel="help" href="https://w3c.github.io/browser-payment-api/#abort-method">
		8	<script src="/resources/testharness.js"></script>
		9	<script src="/resources/testharnessreport.js"></script>
		10	<script>
		11	"use strict";
		12	setup(() => {}, {
		13	// Ignore unhandled rejections resulting from .show()'s acceptPromise
		14	// not being explicitly handled.
		15	allow_uncaught_exception: true,
		16	});
		17	const applePay = Object.freeze({
		18	supportedMethods: "https://apple.com/apple-pay",
		19	data: {
		20	version: 2,
		21	merchantCapabilities: ['supports3DS'],
		22	supportedNetworks: ['visa', 'masterCard'],
		23	countryCode: 'US',
		24	currencyCode: 'USD',
		25	},
		26	});
		27	const defaultMethods = Object.freeze([applePay]);
		28	const defaultDetails = Object.freeze({
		29	total: {
		30	label: "Total",
		31	amount: {
		32	currency: "USD",
		33	value: "1.00",
		34	},
		35	},
		36	});
		37
		38	promise_test(async t => {
		39	// request is in "created" state
		40	const request = new PaymentRequest(defaultMethods, defaultDetails);
		41	await promise_rejects(t, "InvalidStateError", request.abort());
		42	}, `Throws if the promise [[state]] is not "interactive"`);
		43
		44	promise_test(async t => {
		45	// request is in "created" state.
		46	const request = new PaymentRequest(defaultMethods, defaultDetails);
		47	await promise_rejects(t, "InvalidStateError", request.abort());
		48	// Call it again, for good measure.
		49	await promise_rejects(t, "InvalidStateError", request.abort());
		50	// The request's state is "created", so let's show it
		51	// which changes the state to "interactive.".
		52	request.show();
		53	// Let's set request the state to "closed" by calling .abort()
		54	try {
		55	await request.abort();
		56	} catch (err) {
		57	assert_true(false, "Unexpected promise rejection: " + err.message);
		58	}
		59	// The request is now "closed", so...
		60	await promise_rejects(t, "InvalidStateError", request.abort());
		61	}, `Calling abort must not change the [[state]] until after "interactive"`);
		62
		63	promise_test(async t => {
		64	const request = new PaymentRequest(defaultMethods, defaultDetails);
65	const acceptPromise = request.show();
66	try {
67	await request.abort();
68	} catch (err) {
69	assert_true(false, "Unexpected promise rejection: " + err.message);
70	}
71	await promise_rejects(t, "AbortError", acceptPromise);
72	// As request is now "closed", trying to show it will fail
73	await promise_rejects(t, "InvalidStateError", request.show());
74	}, "calling .abort() causes acceptPromise to reject and closes the request.");
75
76	</script>

Lines 28-41 fast/viewport/ios/viewport-fit-contain.html [ Skip ] a/LayoutTests/platform/ios-wk2/TestExpectations_sec1
- a/LayoutTests/platform/ios-wk2/TestExpectations -3 / +6 lines
28	fast/viewport/ios/viewport-fit-cover.html [ Skip ]	28	fast/viewport/ios/viewport-fit-cover.html [ Skip ]
29	fast/viewport/ios/viewport-fit-auto.html [ Skip ]	29	fast/viewport/ios/viewport-fit-auto.html [ Skip ]
30		30
31	imported/w3c/web-platform-tests/payment-request [ Pass ]	31	[ Sierra+ ] http/tests/paymentrequest [ Pass ]
		32	[ Sierra+ ] imported/w3c/web-platform-tests/payment-request [ Pass ]
32	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]	33	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]
33	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html [ Skip ]	34	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html [ Skip ]
34	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]	35	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]
35	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html [ Skip ]	36	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html [ Skip ]
36	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html [ Skip ]	37	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html [ Skip ]
37	webkit.org/b/177391 imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ Pass Failure ]	38
38	webkit.org/b/177391 imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ Pass Failure ]	39	# skip in favor of tests in http/tests/paymentrequest
		40	imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ Skip ]
		41	imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ Skip ]
39		42
40	# skip manual payment-request tests	43	# skip manual payment-request tests
41	imported/w3c/web-platform-tests/payment-request/algorithms-manual.https.html [ Skip ]	44	imported/w3c/web-platform-tests/payment-request/algorithms-manual.https.html [ Skip ]

Lines 25-39 fast/media/mq-prefers-reduced-motion-live-update.html [ Pass ] a/LayoutTests/platform/mac-wk2/TestExpectations_sec1
- a/LayoutTests/platform/mac-wk2/TestExpectations -3 / +6 lines
25	fast/visual-viewport/rubberbanding-viewport-rects.html [ Pass ]	25	fast/visual-viewport/rubberbanding-viewport-rects.html [ Pass ]
26	fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html [ Pass ]	26	fast/visual-viewport/rubberbanding-viewport-rects-header-footer.html [ Pass ]
27		27
28	imported/w3c/web-platform-tests/payment-request [ Pass ]	28	[ Sierra+ ] http/tests/paymentrequest [ Pass ]
		29	[ Sierra+ ] imported/w3c/web-platform-tests/payment-request [ Pass ]
29	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]	30	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/allowpaymentrequest-attribute-cross-origin-bc-containers.https.html [ Skip ]
30	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html [ Skip ]	31	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/no-attribute-cross-origin-bc-containers.https.html [ Skip ]
31	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]	32	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/removing-allowpaymentrequest.https.sub.html [ Skip ]
32	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html [ Skip ]	33	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest-timing.https.sub.html [ Skip ]
33	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html [ Skip ]	34	webkit.org/b/175611 imported/w3c/web-platform-tests/payment-request/allowpaymentrequest/setting-allowpaymentrequest.https.sub.html [ Skip ]
34	webkit.org/b/177783 imported/w3c/web-platform-tests/payment-request/rejects_if_not_active.https.html [ Skip ]	35	webkit.org/b/177783 imported/w3c/web-platform-tests/payment-request/rejects_if_not_active.https.html [ Skip ]
35	webkit.org/b/177391 imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ Pass Failure ]	36
36	webkit.org/b/177391 imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ Pass Failure ]	37	# skip in favor of tests in http/tests/paymentrequest
		38	imported/w3c/web-platform-tests/payment-request/payment-request-show-method.https.html [ Skip ]
		39	imported/w3c/web-platform-tests/payment-request/payment-request-abort-method.https.html [ Skip ]
37		40
38	# skip manual payment-request tests	41	# skip manual payment-request tests
39	imported/w3c/web-platform-tests/payment-request/algorithms-manual.https.html [ Skip ]	42	imported/w3c/web-platform-tests/payment-request/algorithms-manual.https.html [ Skip ]