Changeset 202345 in webkit

Timestamp:

Jun 22, 2016 1:00:03 PM (8 years ago)

Author:

andersca@apple.com

Message:

Inline the last of the Apple Pay WebCore code
​https://bugs.webkit.org/show_bug.cgi?id=159032

Reviewed by Tim Horton.

• loader/EmptyClients.cpp:

(WebCore::fillWithEmptyClients):

• page/MainFrame.cpp:

(WebCore::MainFrame::MainFrame):

• page/MainFrame.h:
• page/PageConfiguration.h:
• platform/cocoa/ThemeCocoa.mm:

(WebCore::passKitBundle):
(WebCore::loadPassKitPDFPage):
(WebCore::applePayButtonLogoBlack):
(WebCore::applePayButtonLogoWhite):
(WebCore::drawApplePayButton):
(WebCore::ThemeCocoa::drawNamedImage):

Location:

trunk/Source/WebCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• loader/EmptyClients.cpp (modified) (4 diffs)
• page/MainFrame.cpp (modified) (3 diffs)
• page/MainFrame.h (modified) (2 diffs)
• page/PageConfiguration.h (modified) (4 diffs)
• platform/cocoa/ThemeCocoa.mm (modified) (2 diffs)

trunk/Source/WebCore/CMakeLists.txt

@@ -6 +6 @@
     "${WEBCORE_DIR}"
     "${WEBCORE_DIR}/Modules/airplay"
+    "${WEBCORE_DIR}/Modules/applepay"
     "${WEBCORE_DIR}/Modules/battery"
     "${WEBCORE_DIR}/Modules/encryptedmedia"

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-22  Anders Carlsson  <andersca@apple.com>
+
+        Inline the last of the Apple Pay WebCore code
+        https://bugs.webkit.org/show_bug.cgi?id=159032
+
+        Reviewed by Tim Horton.
+
+        * loader/EmptyClients.cpp:
+        (WebCore::fillWithEmptyClients):
+        * page/MainFrame.cpp:
+        (WebCore::MainFrame::MainFrame):
+        * page/MainFrame.h:
+        * page/PageConfiguration.h:
+        * platform/cocoa/ThemeCocoa.mm:
+        (WebCore::passKitBundle):
+        (WebCore::loadPassKitPDFPage):
+        (WebCore::applePayButtonLogoBlack):
+        (WebCore::applePayButtonLogoWhite):
+        (WebCore::drawApplePayButton):
+        (WebCore::ThemeCocoa::drawNamedImage):
+
 2016-06-22  Anders Carlsson  <andersca@apple.com>
 

trunk/Source/WebCore/loader/EmptyClients.cpp

@@ -42 +42 @@
 #include "Page.h"
 #include "PageConfiguration.h"
+#include "PaymentCoordinatorClient.h"
 #include "StorageArea.h"
 #include "StorageNamespace.h"
@@ -48 +49 @@
 #include <wtf/NeverDestroyed.h>
 
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/EmptyClientsIncludes.h>
-#endif
-
 namespace WebCore {
+
+#if ENABLE(APPLE_PAY)
+class EmptyPaymentCoordinatorClient final : public PaymentCoordinatorClient {
+    bool supportsVersion(unsigned) override { return false; }
+    bool canMakePayments() override { return false; }
+    void canMakePaymentsWithActiveCard(const String&, const String&, std::function<void (bool)> completionHandler) override { callOnMainThread([completionHandler] { completionHandler(false); }); }
+    void showPaymentUI(const URL&, const Vector<URL>&, const PaymentRequest&) override { }
+    void completeMerchantValidation(const PaymentMerchantSession&) override { }
+
+    void completeShippingMethodSelection(PaymentAuthorizationStatus, Optional<PaymentRequest::TotalAndLineItems>) override { }
+    void completeShippingContactSelection(PaymentAuthorizationStatus, const Vector<PaymentRequest::ShippingMethod>&, Optional<PaymentRequest::TotalAndLineItems>) override { }
+    void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>) override { }
+    void completePaymentSession(PaymentAuthorizationStatus) override { }
+    void abortPaymentSession() override { }
+    void mainFrameDestroyed() override { }
+};
+#endif
 
 class EmptyDatabaseProvider final : public DatabaseProvider {
@@ -121 +135 @@
     pageConfiguration.chromeClient = &dummyChromeClient.get();
 
+#if ENABLE(APPLE_PAY)
+    static NeverDestroyed<EmptyPaymentCoordinatorClient> dummyPaymentCoordinatorClient;
+    pageConfiguration.paymentCoordinatorClient = &dummyPaymentCoordinatorClient.get();
+#endif
+
 #if ENABLE(CONTEXT_MENUS)
     static NeverDestroyed<EmptyContextMenuClient> dummyContextMenuClient;
@@ -147 +166 @@
     pageConfiguration.userContentProvider = adoptRef(new EmptyUserContentProvider);
     pageConfiguration.visitedLinkStore = adoptRef(new EmptyVisitedLinkStore);
-
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/EmptyClientsFill.cpp>
-#endif
 }
 

trunk/Source/WebCore/page/MainFrame.cpp

@@ -31 +31 @@
 #include "PageConfiguration.h"
 #include "PageOverlayController.h"
+#include "PaymentCoordinator.h"
 #include "ScrollLatchingState.h"
 #include "Settings.h"
@@ -38 +39 @@
 #if PLATFORM(MAC)
 #include "ServicesOverlayController.h"
-#endif /* PLATFORM(MAC) */
-
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/MainFrameIncludes.h>
 #endif
 
@@ -49 +46 @@
     : Frame(page, nullptr, *configuration.loaderClientForMainFrame)
     , m_selfOnlyRefCount(0)
-#if PLATFORM(MAC)
-#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
+#if PLATFORM(MAC) && (ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION))
     , m_servicesOverlayController(std::make_unique<ServicesOverlayController>(*this))
-#endif
 #endif
     , m_recentWheelEventDeltaFilter(WheelEventDeltaFilter::create())
     , m_pageOverlayController(std::make_unique<PageOverlayController>(*this))
+#if ENABLE(APPLE_PAY)
+    , m_paymentCoordinator(std::make_unique<PaymentCoordinator>(*configuration.paymentCoordinatorClient))
+#endif
 {
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/MainFrameInitialization.cpp>
-#endif
 }
 

trunk/Source/WebCore/page/MainFrame.h

@@ -64 +64 @@
 #endif // PLATFORM(MAC)
 
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/MainFrameMembers.h>
+#if ENABLE(APPLE_PAY)
+    PaymentCoordinator& paymentCoordinator() const { return *m_paymentCoordinator; }
 #endif
 
@@ -84 +84 @@
     std::unique_ptr<WheelEventDeltaFilter> m_recentWheelEventDeltaFilter;
     std::unique_ptr<PageOverlayController> m_pageOverlayController;
+
+#if ENABLE(APPLE_PAY)
+    std::unique_ptr<PaymentCoordinator> m_paymentCoordinator;
+#endif
 };
 

trunk/Source/WebCore/page/PageConfiguration.h

@@ -30 +30 @@
 #include <wtf/UniqueRef.h>
 
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/PageConfigurationIncludes.h>
-#endif
-
 namespace WebCore {
 
@@ -46 +42 @@
 class FrameLoaderClient;
 class InspectorClient;
+class PaymentCoordinatorClient;
 class PlugInClient;
 class ProgressTrackerClient;
@@ -73 +70 @@
     DragClient* dragClient { nullptr };
     InspectorClient* inspectorClient { nullptr };
+#if ENABLE(APPLE_PAY)
+    PaymentCoordinatorClient* paymentCoordinatorClient { nullptr };
+#endif
+
     PlugInClient* plugInClient { nullptr };
     ProgressTrackerClient* progressTrackerClient { nullptr };
@@ -79 +80 @@
     FrameLoaderClient* loaderClientForMainFrame { nullptr };
     std::unique_ptr<DiagnosticLoggingClient> diagnosticLoggingClient { nullptr };
-
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/PageConfigurationMembers.h>
-#endif
 
     RefPtr<ApplicationCacheStorage> applicationCacheStorage;

trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm

@@ -54 +54 @@
 }
 
+#if ENABLE(APPLE_PAY)
+static NSBundle *passKitBundle()
+{
+    static NSBundle *passKitBundle;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+#if PLATFORM(MAC)
+        passKitBundle = [NSBundle bundleWithURL:[NSURL fileURLWithPath:@"/System/Library/PrivateFrameworks/PassKit.framework"]];
+#else
+        dlopen("/System/Library/Frameworks/PassKit.framework/PassKit", RTLD_NOW);
+        passKitBundle = [NSBundle bundleForClass:NSClassFromString(@"PKPaymentAuthorizationViewController")];
+#endif
+    });
+
+    return passKitBundle;
+}
+
+static RetainPtr<CGPDFPageRef> loadPassKitPDFPage(NSString *imageName)
+{
+    NSURL *url = [passKitBundle() URLForResource:imageName withExtension:@"pdf"];
+    if (!url)
+        return nullptr;
+
+    auto document = adoptCF(CGPDFDocumentCreateWithURL((CFURLRef)url));
+    if (!document)
+        return nullptr;
+
+    if (!CGPDFDocumentGetNumberOfPages(document.get()))
+        return nullptr;
+
+    return CGPDFDocumentGetPage(document.get(), 1);
+};
+
+static CGPDFPageRef applePayButtonLogoBlack()
+{
+    static CGPDFPageRef logoPage;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        logoPage = loadPassKitPDFPage(@"PayButtonLogoBlack").leakRef();
+    });
+
+    return logoPage;
+};
+
+static CGPDFPageRef applePayButtonLogoWhite()
+{
+    static CGPDFPageRef logoPage;
+    static dispatch_once_t onceToken;
+    dispatch_once(&onceToken, ^{
+        logoPage = loadPassKitPDFPage(@"PayButtonLogoWhite").leakRef();
+    });
+
+    return logoPage;
+};
+
+static void drawApplePayButton(GraphicsContext& context, CGPDFPageRef page, const FloatRect& rect)
+{
+    CGSize pdfSize = CGPDFPageGetBoxRect(page, kCGPDFMediaBox).size;
+    GraphicsContextStateSaver stateSaver(context);
+    fitContextToBox(context, FloatSize(pdfSize), rect.size());
+
+    CGContextTranslateCTM(context.platformContext(), 0, pdfSize.height);
+    CGContextScaleCTM(context.platformContext(), 1, -1);
+
+    CGContextDrawPDFPage(context.platformContext(), page);
+};
+
+#endif
+
 void ThemeCocoa::drawNamedImage(const String& name, GraphicsContext& context, const FloatRect& rect) const
 {
-    // We only handle one icon at the moment.
     if (name == "wireless-playback") {
         GraphicsContextStateSaver stateSaver(context);
@@ -89 +157 @@
     }
 
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/ThemeCocoaDrawNamedImage.mm>
+#if ENABLE(APPLE_PAY)
+    if (name == "apple-pay-logo-black") {
+        if (auto logo = applePayButtonLogoBlack()) {
+            drawApplePayButton(context, logo, rect);
+            return;
+        }
+    }
+
+    if (name == "apple-pay-logo-white") {
+        if (auto logo = applePayButtonLogoWhite()) {
+            drawApplePayButton(context, logo, rect);
+            return;
+        }
+    }
 #endif