<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[202345] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/202345">202345</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 13:00:03 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreCMakeListstxt">trunk/Source/WebCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMainFramecpp">trunk/Source/WebCore/page/MainFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMainFrameh">trunk/Source/WebCore/page/MainFrame.h</a></li>
<li><a href="#trunkSourceWebCorepagePageConfigurationh">trunk/Source/WebCore/page/PageConfiguration.h</a></li>
<li><a href="#trunkSourceWebCoreplatformcocoaThemeCocoamm">trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/CMakeLists.txt (202344 => 202345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/CMakeLists.txt 2016-06-22 19:36:35 UTC (rev 202344)
+++ trunk/Source/WebCore/CMakeLists.txt 2016-06-22 20:00:03 UTC (rev 202345)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx"> set(WebCore_INCLUDE_DIRECTORIES
</span><span class="cx"> "${WEBCORE_DIR}"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/airplay"
</span><ins>+ "${WEBCORE_DIR}/Modules/applepay"
</ins><span class="cx"> "${WEBCORE_DIR}/Modules/battery"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/encryptedmedia"
</span><span class="cx"> "${WEBCORE_DIR}/Modules/fetch"
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202344 => 202345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-22 19:36:35 UTC (rev 202344)
+++ trunk/Source/WebCore/ChangeLog 2016-06-22 20:00:03 UTC (rev 202345)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2016-06-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ 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>
+
</ins><span class="cx"> Exception is not thrown when shipping method is an invalid amount
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=159030
</span><span class="cx"> rdar://problem/26700413
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (202344 => 202345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-06-22 19:36:35 UTC (rev 202344)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-06-22 20:00:03 UTC (rev 202345)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "InProcessIDBServer.h"
</span><span class="cx"> #include "Page.h"
</span><span class="cx"> #include "PageConfiguration.h"
</span><ins>+#include "PaymentCoordinatorClient.h"
</ins><span class="cx"> #include "StorageArea.h"
</span><span class="cx"> #include "StorageNamespace.h"
</span><span class="cx"> #include "StorageNamespaceProvider.h"
</span><span class="lines">@@ -47,12 +48,25 @@
</span><span class="cx"> #include "UserContentProvider.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/EmptyClientsIncludes.h>
</del><ins>+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 { }
+};
</ins><span class="cx"> #endif
</span><span class="cx">
</span><del>-namespace WebCore {
-
</del><span class="cx"> class EmptyDatabaseProvider final : public DatabaseProvider {
</span><span class="cx"> #if ENABLE(INDEXED_DATABASE)
</span><span class="cx"> virtual IDBClient::IDBConnectionToServer& idbConnectionToServerForSession(const SessionID&)
</span><span class="lines">@@ -120,6 +134,11 @@
</span><span class="cx"> static NeverDestroyed<EmptyChromeClient> dummyChromeClient;
</span><span class="cx"> pageConfiguration.chromeClient = &dummyChromeClient.get();
</span><span class="cx">
</span><ins>+#if ENABLE(APPLE_PAY)
+ static NeverDestroyed<EmptyPaymentCoordinatorClient> dummyPaymentCoordinatorClient;
+ pageConfiguration.paymentCoordinatorClient = &dummyPaymentCoordinatorClient.get();
+#endif
+
</ins><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> static NeverDestroyed<EmptyContextMenuClient> dummyContextMenuClient;
</span><span class="cx"> pageConfiguration.contextMenuClient = &dummyContextMenuClient.get();
</span><span class="lines">@@ -146,10 +165,6 @@
</span><span class="cx"> pageConfiguration.storageNamespaceProvider = adoptRef(new EmptyStorageNamespaceProvider);
</span><span class="cx"> pageConfiguration.userContentProvider = adoptRef(new EmptyUserContentProvider);
</span><span class="cx"> pageConfiguration.visitedLinkStore = adoptRef(new EmptyVisitedLinkStore);
</span><del>-
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/EmptyClientsFill.cpp>
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class EmptyPopupMenu : public PopupMenu {
</span></span></pre></div>
<a id="trunkSourceWebCorepageMainFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MainFrame.cpp (202344 => 202345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MainFrame.cpp 2016-06-22 19:36:35 UTC (rev 202344)
+++ trunk/Source/WebCore/page/MainFrame.cpp 2016-06-22 20:00:03 UTC (rev 202345)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx"> #include "EmptyClients.h"
</span><span class="cx"> #include "PageConfiguration.h"
</span><span class="cx"> #include "PageOverlayController.h"
</span><ins>+#include "PaymentCoordinator.h"
</ins><span class="cx"> #include "ScrollLatchingState.h"
</span><span class="cx"> #include "Settings.h"
</span><span class="cx"> #include "WheelEventDeltaFilter.h"
</span><span class="lines">@@ -37,10 +38,6 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> #include "ServicesOverlayController.h"
</span><del>-#endif /* PLATFORM(MAC) */
-
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/MainFrameIncludes.h>
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="lines">@@ -48,17 +45,15 @@
</span><span class="cx"> inline MainFrame::MainFrame(Page& page, PageConfiguration& configuration)
</span><span class="cx"> : Frame(page, nullptr, *configuration.loaderClientForMainFrame)
</span><span class="cx"> , m_selfOnlyRefCount(0)
</span><del>-#if PLATFORM(MAC)
-#if ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION)
</del><ins>+#if PLATFORM(MAC) && (ENABLE(SERVICE_CONTROLS) || ENABLE(TELEPHONE_NUMBER_DETECTION))
</ins><span class="cx"> , m_servicesOverlayController(std::make_unique<ServicesOverlayController>(*this))
</span><span class="cx"> #endif
</span><del>-#endif
</del><span class="cx"> , m_recentWheelEventDeltaFilter(WheelEventDeltaFilter::create())
</span><span class="cx"> , m_pageOverlayController(std::make_unique<PageOverlayController>(*this))
</span><ins>+#if ENABLE(APPLE_PAY)
+ , m_paymentCoordinator(std::make_unique<PaymentCoordinator>(*configuration.paymentCoordinatorClient))
+#endif
</ins><span class="cx"> {
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/MainFrameInitialization.cpp>
-#endif
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MainFrame::~MainFrame()
</span></span></pre></div>
<a id="trunkSourceWebCorepageMainFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MainFrame.h (202344 => 202345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MainFrame.h 2016-06-22 19:36:35 UTC (rev 202344)
+++ trunk/Source/WebCore/page/MainFrame.h 2016-06-22 20:00:03 UTC (rev 202345)
</span><span class="lines">@@ -63,8 +63,8 @@
</span><span class="cx"> void removeLatchingStateForTarget(Element&);
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/MainFrameMembers.h>
</del><ins>+#if ENABLE(APPLE_PAY)
+ PaymentCoordinator& paymentCoordinator() const { return *m_paymentCoordinator; }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="lines">@@ -83,6 +83,10 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WheelEventDeltaFilter> m_recentWheelEventDeltaFilter;
</span><span class="cx"> std::unique_ptr<PageOverlayController> m_pageOverlayController;
</span><ins>+
+#if ENABLE(APPLE_PAY)
+ std::unique_ptr<PaymentCoordinator> m_paymentCoordinator;
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> inline bool Frame::isMainFrame() const
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConfiguration.h (202344 => 202345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/PageConfiguration.h 2016-06-22 19:36:35 UTC (rev 202344)
+++ trunk/Source/WebCore/page/PageConfiguration.h 2016-06-22 20:00:03 UTC (rev 202345)
</span><span class="lines">@@ -29,10 +29,6 @@
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx"> #include <wtf/UniqueRef.h>
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/PageConfigurationIncludes.h>
-#endif
-
</del><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class AlternativeTextClient;
</span><span class="lines">@@ -45,6 +41,7 @@
</span><span class="cx"> class EditorClient;
</span><span class="cx"> class FrameLoaderClient;
</span><span class="cx"> class InspectorClient;
</span><ins>+class PaymentCoordinatorClient;
</ins><span class="cx"> class PlugInClient;
</span><span class="cx"> class ProgressTrackerClient;
</span><span class="cx"> class SocketProvider;
</span><span class="lines">@@ -72,6 +69,10 @@
</span><span class="cx"> UniqueRef<SocketProvider> socketProvider;
</span><span class="cx"> DragClient* dragClient { nullptr };
</span><span class="cx"> InspectorClient* inspectorClient { nullptr };
</span><ins>+#if ENABLE(APPLE_PAY)
+ PaymentCoordinatorClient* paymentCoordinatorClient { nullptr };
+#endif
+
</ins><span class="cx"> PlugInClient* plugInClient { nullptr };
</span><span class="cx"> ProgressTrackerClient* progressTrackerClient { nullptr };
</span><span class="cx"> RefPtr<BackForwardClient> backForwardClient;
</span><span class="lines">@@ -79,10 +80,6 @@
</span><span class="cx"> FrameLoaderClient* loaderClientForMainFrame { nullptr };
</span><span class="cx"> std::unique_ptr<DiagnosticLoggingClient> diagnosticLoggingClient { nullptr };
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/PageConfigurationMembers.h>
-#endif
-
</del><span class="cx"> RefPtr<ApplicationCacheStorage> applicationCacheStorage;
</span><span class="cx"> RefPtr<DatabaseProvider> databaseProvider;
</span><span class="cx"> RefPtr<StorageNamespaceProvider> storageNamespaceProvider;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaThemeCocoamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm (202344 => 202345)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm 2016-06-22 19:36:35 UTC (rev 202344)
+++ trunk/Source/WebCore/platform/cocoa/ThemeCocoa.mm 2016-06-22 20:00:03 UTC (rev 202345)
</span><span class="lines">@@ -53,9 +53,77 @@
</span><span class="cx"> context.scale(FloatSize(scale, scale));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#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
+
</ins><span class="cx"> void ThemeCocoa::drawNamedImage(const String& name, GraphicsContext& context, const FloatRect& rect) const
</span><span class="cx"> {
</span><del>- // We only handle one icon at the moment.
</del><span class="cx"> if (name == "wireless-playback") {
</span><span class="cx"> GraphicsContextStateSaver stateSaver(context);
</span><span class="cx"> context.setFillColor(Color::black);
</span><span class="lines">@@ -88,8 +156,20 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/ThemeCocoaDrawNamedImage.mm>
</del><ins>+#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;
+ }
+ }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> Theme::drawNamedImage(name, context, rect);
</span></span></pre>
</div>
</div>
</body>
</html>