Changeset 243443 in webkit

Timestamp:

Mar 25, 2019, 11:26:10 AM (7 years ago)

Author:

aestes@apple.com

Message:

[Apple Pay] Remove the AvailablePaymentNetworks synchronous message
​https://bugs.webkit.org/show_bug.cgi?id=196180

Reviewed by Youenn Fablet.

Unlike many PassKit interactions, it's ok to call +[PKPaymentRequest availableNetworks]
without an entitlement. Therefore, we can call it from the web process directly rather than
synchronously messaging the entitled UI or networking process.

• Shared/ApplePay/WebPaymentCoordinatorProxy.cpp:
• Shared/ApplePay/WebPaymentCoordinatorProxy.h:
• Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in:
• Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
• SourcesCocoa.txt:
• WebKit.xcodeproj/project.pbxproj:
• WebProcess/ApplePay/WebPaymentCoordinator.cpp:

(WebKit::WebPaymentCoordinator::availablePaymentNetworks):

• WebProcess/ApplePay/WebPaymentCoordinator.h:
• WebProcess/ApplePay/cocoa/WebPaymentCoordinatorCocoa.mm: Added.

(WebKit::WebPaymentCoordinator::platformAvailablePaymentNetworks const):

• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:

(-[WKAccessibilityWebPageObjectBase accessibilityRootObjectWrapper]):
(-[WKAccessibilityWebPageObjectBase setWebPage:]):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• Shared/ApplePay/WebPaymentCoordinatorProxy.cpp (modified) (1 diff)
• Shared/ApplePay/WebPaymentCoordinatorProxy.h (modified) (2 diffs)
• Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in (modified) (1 diff)
• Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm (modified) (1 diff)
• SourcesCocoa.txt (modified) (1 diff)
• WebKit.xcodeproj/project.pbxproj (modified) (3 diffs)
• WebProcess/ApplePay/WebPaymentCoordinator.cpp (modified) (1 diff)
• WebProcess/ApplePay/WebPaymentCoordinator.h (modified) (1 diff)
• WebProcess/ApplePay/cocoa (added)
• WebProcess/ApplePay/cocoa/WebPaymentCoordinatorCocoa.mm (added)
• WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2019-03-25  Andy Estes  <aestes@apple.com>
+
+        [Apple Pay] Remove the AvailablePaymentNetworks synchronous message
+        https://bugs.webkit.org/show_bug.cgi?id=196180
+
+        Reviewed by Youenn Fablet.
+
+        Unlike many PassKit interactions, it's ok to call +[PKPaymentRequest availableNetworks]
+        without an entitlement. Therefore, we can call it from the web process directly rather than
+        synchronously messaging the entitled UI or networking process.
+
+        * Shared/ApplePay/WebPaymentCoordinatorProxy.cpp:
+        * Shared/ApplePay/WebPaymentCoordinatorProxy.h:
+        * Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in:
+        * Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm:
+        * SourcesCocoa.txt:
+        * WebKit.xcodeproj/project.pbxproj:
+        * WebProcess/ApplePay/WebPaymentCoordinator.cpp:
+        (WebKit::WebPaymentCoordinator::availablePaymentNetworks):
+        * WebProcess/ApplePay/WebPaymentCoordinator.h:
+        * WebProcess/ApplePay/cocoa/WebPaymentCoordinatorCocoa.mm: Added.
+        (WebKit::WebPaymentCoordinator::platformAvailablePaymentNetworks const):
+        * WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm:
+        (-[WKAccessibilityWebPageObjectBase accessibilityRootObjectWrapper]):
+        (-[WKAccessibilityWebPageObjectBase setWebPage:]):
+
 2019-03-25  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/Shared/ApplePay/WebPaymentCoordinatorProxy.cpp

@@ -69 +69 @@
 }
 
-void WebPaymentCoordinatorProxy::availablePaymentNetworks(CompletionHandler<void(Vector<String>&&)>&& completionHandler)
-{
-    completionHandler(platformAvailablePaymentNetworks());
-}
-
 void WebPaymentCoordinatorProxy::canMakePayments(CompletionHandler<void(bool)>&& reply)
 {

trunk/Source/WebKit/Shared/ApplePay/WebPaymentCoordinatorProxy.h

@@ -112 +112 @@
 
     // Message handlers
-    void availablePaymentNetworks(CompletionHandler<void(Vector<String>&&)>&&);
     void canMakePayments(CompletionHandler<void(bool)>&&);
     void canMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, PAL::SessionID, CompletionHandler<void(bool)>&&);
@@ -134 +133 @@
     void hidePaymentUI();
 
-    Vector<String> platformAvailablePaymentNetworks();
     bool platformCanMakePayments();
     void platformCanMakePaymentsWithActiveCard(const String& merchantIdentifier, const String& domainName, PAL::SessionID, WTF::Function<void(bool)>&& completionHandler);

trunk/Source/WebKit/Shared/ApplePay/WebPaymentCoordinatorProxy.messages.in

@@ -27 +27 @@
 messages -> WebPaymentCoordinatorProxy {
 
-    AvailablePaymentNetworks() -> (Vector<String> availablePaymentNetworks) Synchronous
     CanMakePayments() -> (bool result) Synchronous
     CanMakePaymentsWithActiveCard(String merchantIdentifier, String domainName, PAL::SessionID sessionID) -> (bool canMakePayments) Async

trunk/Source/WebKit/Shared/ApplePay/cocoa/WebPaymentCoordinatorProxyCocoa.mm

@@ -350 +350 @@
 }
 
-Vector<String> WebPaymentCoordinatorProxy::platformAvailablePaymentNetworks()
-{
-#if PLATFORM(MAC)
-    if (!PAL::isPassKitFrameworkAvailable())
-        return { };
-#endif
-
-    NSArray<PKPaymentNetwork> *availableNetworks = [PAL::getPKPaymentRequestClass() availableNetworks];
-    Vector<String> result;
-    result.reserveInitialCapacity(availableNetworks.count);
-    for (PKPaymentNetwork network in availableNetworks)
-        result.uncheckedAppend(network);
-    return result;
-}
-
 } // namespace WebKit
 

trunk/Source/WebKit/SourcesCocoa.txt

@@ -495 +495 @@
 WebProcess/ApplePay/WebPaymentCoordinator.cpp
 
+WebProcess/ApplePay/cocoa/WebPaymentCoordinatorCocoa.mm
+
 WebProcess/cocoa/PlaybackSessionManager.mm
 WebProcess/cocoa/UserMediaCaptureManager.cpp

trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj

@@ -3904 +3904 @@
                 A1A4FE6018DD54A400B5EA8A /* _WKDownloadDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKDownloadDelegate.h; sourceTree = "<group>"; };
                 A1B89B92221E023300EB4CEA /* SDKVariant.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = SDKVariant.xcconfig; sourceTree = "<group>"; };
+                A1B9CA382246E54A003D6DCA /* WebPaymentCoordinatorCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPaymentCoordinatorCocoa.mm; sourceTree = "<group>"; };
                 A1C512C6190656E500448914 /* WebPreviewLoaderClient.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPreviewLoaderClient.cpp; path = ios/WebPreviewLoaderClient.cpp; sourceTree = "<group>"; };
                 A1C512C7190656E500448914 /* WebPreviewLoaderClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebPreviewLoaderClient.h; path = ios/WebPreviewLoaderClient.h; sourceTree = "<group>"; };
@@ -5297 +5298 @@
                         isa = PBXGroup;
                         children = (
+                                A1B9CA372246E525003D6DCA /* cocoa */,
                                 1AB1F7711D1B2F7E007C9BD1 /* WebPaymentCoordinator.cpp */,
                                 1AB1F7721D1B2F7E007C9BD1 /* WebPaymentCoordinator.h */,
@@ -7189 +7191 @@
                         );
                         path = ios;
+                        sourceTree = "<group>";
+                };
+                A1B9CA372246E525003D6DCA /* cocoa */ = {
+                        isa = PBXGroup;
+                        children = (
+                                A1B9CA382246E54A003D6DCA /* WebPaymentCoordinatorCocoa.mm */,
+                        );
+                        path = cocoa;
                         sourceTree = "<group>";
                 };

trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.cpp

@@ -60 +60 @@
 }
 
-const WebPaymentCoordinator::AvailablePaymentNetworksSet& WebPaymentCoordinator::availablePaymentNetworks()
-{
-    if (m_availablePaymentNetworks)
-        return *m_availablePaymentNetworks;
-
-    m_availablePaymentNetworks = WebPaymentCoordinator::AvailablePaymentNetworksSet();
-
-    Vector<String> availablePaymentNetworks;
-    using AvailablePaymentNetworksMessage = Messages::WebPaymentCoordinatorProxy::AvailablePaymentNetworks;
-    if (sendSync(AvailablePaymentNetworksMessage(), AvailablePaymentNetworksMessage::Reply(availablePaymentNetworks))) {
-        for (auto& network : availablePaymentNetworks)
-            m_availablePaymentNetworks->add(network);
-    }
-
-    return *m_availablePaymentNetworks;
-}
-
 Optional<String> WebPaymentCoordinator::validatedPaymentNetwork(const String& paymentNetwork)
 {
-    auto& paymentNetworks = availablePaymentNetworks();
-    auto result = paymentNetworks.find(paymentNetwork);
-    if (result == paymentNetworks.end())
+    if (!m_availablePaymentNetworks)
+        m_availablePaymentNetworks = platformAvailablePaymentNetworks();
+
+    auto result = m_availablePaymentNetworks->find(paymentNetwork);
+    if (result == m_availablePaymentNetworks->end())
         return WTF::nullopt;
     return *result;

trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h

@@ -103 +103 @@
 
     using AvailablePaymentNetworksSet = HashSet<String, ASCIICaseInsensitiveHash>;
-    const AvailablePaymentNetworksSet& availablePaymentNetworks();
+    static AvailablePaymentNetworksSet platformAvailablePaymentNetworks();
 
     WebPage& m_webPage;

trunk/Source/WebKit/WebProcess/WebPage/mac/WKAccessibilityWebPageObjectBase.mm

@@ -44 +44 @@
 #import <WebCore/Scrollbar.h>
 #import <wtf/ObjCRuntimeExtras.h>
-
-using namespace WebKit;
 
 @implementation WKAccessibilityWebPageObjectBase
@@ -133 +131 @@
 #endif
 
-    if (AXObjectCache* cache = [self axObjectCache]) {
+    if (auto cache = [self axObjectCache]) {
         if (WebCore::AccessibilityObject* root = cache->rootObject())
             return root->wrapper();
@@ -141 +139 @@
 }
 
-- (void)setWebPage:(WebPage*)page
+- (void)setWebPage:(WebKit::WebPage*)page
 {
     m_page = page;