<!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>[202346] trunk/Source/WebKit</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/202346">202346</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-06-22 13:38:15 -0700 (Wed, 22 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move the WebKitLegacy Apple Pay code to the open source repository
https://bugs.webkit.org/show_bug.cgi?id=159035
Reviewed by Tim Horton.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Source/WebKit/mac:
* WebCoreSupport/WebPaymentCoordinatorClient.h: Added.
* WebCoreSupport/WebPaymentCoordinatorClient.mm: Added.
(WebPaymentCoordinatorClient::WebPaymentCoordinatorClient):
(WebPaymentCoordinatorClient::~WebPaymentCoordinatorClient):
(WebPaymentCoordinatorClient::supportsVersion):
(WebPaymentCoordinatorClient::canMakePayments):
(WebPaymentCoordinatorClient::canMakePaymentsWithActiveCard):
(WebPaymentCoordinatorClient::showPaymentUI):
(WebPaymentCoordinatorClient::completeMerchantValidation):
(WebPaymentCoordinatorClient::completeShippingMethodSelection):
(WebPaymentCoordinatorClient::completeShippingContactSelection):
(WebPaymentCoordinatorClient::completePaymentMethodSelection):
(WebPaymentCoordinatorClient::completePaymentSession):
(WebPaymentCoordinatorClient::abortPaymentSession):
(WebPaymentCoordinatorClient::mainFrameDestroyed):
* WebKitAdditions.mm: Removed.
* WebView/WebView.mm:
(-[WebView _commonInitializationWithFrameName:groupName:]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitmacWebKitAdditionsmm">trunk/Source/WebKit/mac/WebKitAdditions.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (202345 => 202346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog 2016-06-22 20:00:03 UTC (rev 202345)
+++ trunk/Source/WebKit/ChangeLog 2016-06-22 20:38:15 UTC (rev 202346)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2016-06-22 Anders Carlsson <andersca@apple.com>
+
+ Move the WebKitLegacy Apple Pay code to the open source repository
+ https://bugs.webkit.org/show_bug.cgi?id=159035
+
+ Reviewed by Tim Horton.
+
+ * WebKit.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2016-06-20 Keith Rollin <krollin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove RefPtr::release() and change calls sites to use WTFMove()
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (202345 => 202346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-06-22 20:00:03 UTC (rev 202345)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-06-22 20:38:15 UTC (rev 202346)
</span><span class="lines">@@ -50,7 +50,6 @@
</span><span class="cx"> 1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
</span><span class="cx"> 1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
</span><span class="cx"> 1A77B02F0EE7730500C8A1F9 /* WebPluginRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */; };
</span><del>- 1A781ACB1C56FF7C00FB96DD /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */; };
</del><span class="cx"> 1A86CCD41AD48A620074BA89 /* WebApplicationCacheInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */; };
</span><span class="cx"> 1A8DED500EE88B8A00F25022 /* HostedNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */; };
</span><span class="cx"> 1A8DED510EE88B8A00F25022 /* HostedNetscapePluginStream.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */; };
</span><span class="lines">@@ -75,6 +74,8 @@
</span><span class="cx"> 1AAF5D0F0EDDE7A7008D883D /* WebKitPluginAgent.defs in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF588A0EDCCEA3008D883D /* WebKitPluginAgent.defs */; };
</span><span class="cx"> 1AAF5FBF0EDE3A92008D883D /* WebHostedNetscapePluginView.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AAF5FBD0EDE3A92008D883D /* WebHostedNetscapePluginView.h */; };
</span><span class="cx"> 1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */; };
</span><ins>+ 1AB1F76E1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F76C1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h */; };
+ 1AB1F76F1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F76D1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm */; };
</ins><span class="cx"> 1AC7176E1A26568A002E3115 /* WebVisitedLinkStore.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AC7176C1A26568A002E3115 /* WebVisitedLinkStore.mm */; };
</span><span class="cx"> 1AC7176F1A26568A002E3115 /* WebVisitedLinkStore.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AC7176D1A26568A002E3115 /* WebVisitedLinkStore.h */; };
</span><span class="cx"> 1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */; };
</span><span class="lines">@@ -506,7 +507,6 @@
</span><span class="cx"> 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
</span><span class="cx"> 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginRequest.m; sourceTree = "<group>"; };
</span><del>- 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebKitAdditions.mm; path = mac/WebKitAdditions.mm; sourceTree = "<group>"; };
</del><span class="cx"> 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HostedNetscapePluginStream.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HostedNetscapePluginStream.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -528,6 +528,8 @@
</span><span class="cx"> 1AAF5D080EDDE71D008D883D /* WebKitPluginHostTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebKitPluginHostTypes.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AAF5FBD0EDE3A92008D883D /* WebHostedNetscapePluginView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebHostedNetscapePluginView.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AAF5FBE0EDE3A92008D883D /* WebHostedNetscapePluginView.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebHostedNetscapePluginView.mm; sourceTree = "<group>"; };
</span><ins>+ 1AB1F76C1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPaymentCoordinatorClient.h; sourceTree = "<group>"; };
+ 1AB1F76D1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebPaymentCoordinatorClient.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1AC7176C1A26568A002E3115 /* WebVisitedLinkStore.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebVisitedLinkStore.mm; sourceTree = "<group>"; };
</span><span class="cx"> 1AC7176D1A26568A002E3115 /* WebVisitedLinkStore.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebVisitedLinkStore.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AEA66D20DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebNetscapePluginEventHandler.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -961,7 +963,6 @@
</span><span class="cx"> F5F732D202FF4D4F01A80180 /* WebKit.exp */,
</span><span class="cx"> 319A3F4D1885E5FB00E0C900 /* WebKit.mac.exp */,
</span><span class="cx"> A10C1D8F1820307D0036883A /* WebKit.iOS.exp */,
</span><del>- 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */,
</del><span class="cx"> F5C283730284676D018635CA /* WebKitPrefix.h */,
</span><span class="cx"> A182B74E199E7B8F001FD95A /* migrate-headers.sh */,
</span><span class="cx"> A182B74F199E7B8F001FD95A /* postprocess-headers.sh */,
</span><span class="lines">@@ -1592,6 +1593,8 @@
</span><span class="cx"> 31C11A6D1476552E0049A4CC /* WebNotificationClient.mm */,
</span><span class="cx"> A58A5797143E727000125F50 /* WebOpenPanelResultListener.h */,
</span><span class="cx"> A58A5798143E727000125F50 /* WebOpenPanelResultListener.mm */,
</span><ins>+ 1AB1F76C1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h */,
+ 1AB1F76D1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm */,
</ins><span class="cx"> 1AA879B411CBE9BF003C664F /* WebPlatformStrategies.h */,
</span><span class="cx"> 1AA879B511CBE9BF003C664F /* WebPlatformStrategies.mm */,
</span><span class="cx"> 1A6A208C1886154600E50F5F /* WebProgressTrackerClient.h */,
</span><span class="lines">@@ -1865,6 +1868,7 @@
</span><span class="cx"> A10C1D721820300E0036883A /* WebMIMETypeRegistry.h in Headers */,
</span><span class="cx"> 5185F62610712B80007AA393 /* WebNavigationData.h in Headers */,
</span><span class="cx"> 1AEA66D40DC6B1FF003D12BF /* WebNetscapePluginEventHandler.h in Headers */,
</span><ins>+ 1AB1F76E1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.h in Headers */,
</ins><span class="cx"> 1AEA66D80DC6B209003D12BF /* WebNetscapePluginEventHandlerCarbon.h in Headers */,
</span><span class="cx"> 1AEA6A500DC8CE2F003D12BF /* WebNetscapePluginEventHandlerCocoa.h in Headers */,
</span><span class="cx"> 939810310824BF01008DF038 /* WebNetscapePluginPackage.h in Headers */,
</span><span class="lines">@@ -2243,6 +2247,7 @@
</span><span class="cx"> 1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */,
</span><span class="cx"> 939810F30824BF01008DF038 /* WebHTMLRepresentation.mm in Sources */,
</span><span class="cx"> 939810F40824BF01008DF038 /* WebHTMLView.mm in Sources */,
</span><ins>+ 1AB1F76F1D1B260B007C9BD1 /* WebPaymentCoordinatorClient.mm in Sources */,
</ins><span class="cx"> 939810C10824BF01008DF038 /* WebIconDatabase.mm in Sources */,
</span><span class="cx"> 51494CD70C7EBDE0004178C5 /* WebIconDatabaseClient.mm in Sources */,
</span><span class="cx"> 9321D5941A391DF9008052BE /* WebImmediateActionController.mm in Sources */,
</span><span class="lines">@@ -2256,7 +2261,6 @@
</span><span class="cx"> 37D1DCA91065928C0068F7EF /* WebJSPDFDoc.mm in Sources */,
</span><span class="cx"> 939811170824BF01008DF038 /* WebKeyGenerator.mm in Sources */,
</span><span class="cx"> 939811030824BF01008DF038 /* WebKitErrors.m in Sources */,
</span><del>- 1A781ACB1C56FF7C00FB96DD /* WebKitAdditions.mm in Sources */,
</del><span class="cx"> CD8BFCE715531224005AFB25 /* WebKitFullScreenListener.mm in Sources */,
</span><span class="cx"> 939810C30824BF01008DF038 /* WebKitLogging.m in Sources */,
</span><span class="cx"> 939810C40824BF01008DF038 /* WebKitNSStringExtras.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (202345 => 202346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2016-06-22 20:00:03 UTC (rev 202345)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-06-22 20:38:15 UTC (rev 202346)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-06-22 Anders Carlsson <andersca@apple.com>
+
+ Move the WebKitLegacy Apple Pay code to the open source repository
+ https://bugs.webkit.org/show_bug.cgi?id=159035
+
+ Reviewed by Tim Horton.
+
+ * WebCoreSupport/WebPaymentCoordinatorClient.h: Added.
+ * WebCoreSupport/WebPaymentCoordinatorClient.mm: Added.
+ (WebPaymentCoordinatorClient::WebPaymentCoordinatorClient):
+ (WebPaymentCoordinatorClient::~WebPaymentCoordinatorClient):
+ (WebPaymentCoordinatorClient::supportsVersion):
+ (WebPaymentCoordinatorClient::canMakePayments):
+ (WebPaymentCoordinatorClient::canMakePaymentsWithActiveCard):
+ (WebPaymentCoordinatorClient::showPaymentUI):
+ (WebPaymentCoordinatorClient::completeMerchantValidation):
+ (WebPaymentCoordinatorClient::completeShippingMethodSelection):
+ (WebPaymentCoordinatorClient::completeShippingContactSelection):
+ (WebPaymentCoordinatorClient::completePaymentMethodSelection):
+ (WebPaymentCoordinatorClient::completePaymentSession):
+ (WebPaymentCoordinatorClient::abortPaymentSession):
+ (WebPaymentCoordinatorClient::mainFrameDestroyed):
+ * WebKitAdditions.mm: Removed.
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+
</ins><span class="cx"> 2016-06-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix build.
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClienth"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h (0 => 202346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h (rev 0)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.h 2016-06-22 20:38:15 UTC (rev 202346)
</span><span class="lines">@@ -0,0 +1,52 @@
</span><ins>+/*
+ * Copyright (C) 2015 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
+
+#import <WebCore/PaymentCoordinatorClient.h>
+
+#if ENABLE(APPLE_PAY)
+
+class WebPaymentCoordinatorClient final : public WebCore::PaymentCoordinatorClient {
+public:
+ WebPaymentCoordinatorClient();
+
+private:
+ ~WebPaymentCoordinatorClient();
+
+ bool supportsVersion(unsigned) override;
+ bool canMakePayments() override;
+ void canMakePaymentsWithActiveCard(const String&, const String&, std::function<void (bool)> completionHandler) override;
+ void showPaymentUI(const WebCore::URL&, const Vector<WebCore::URL>& linkIconURLs, const WebCore::PaymentRequest&) override;
+ void completeMerchantValidation(const WebCore::PaymentMerchantSession&) override;
+ void completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
+ void completeShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>&, Optional<WebCore::PaymentRequest::TotalAndLineItems> newTotalAndItems) override;
+ void completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>) override;
+ void completePaymentSession(WebCore::PaymentAuthorizationStatus) override;
+ void abortPaymentSession() override;
+ void mainFrameDestroyed() override;
+};
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebPaymentCoordinatorClientmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm (0 => 202346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm (rev 0)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebPaymentCoordinatorClient.mm 2016-06-22 20:38:15 UTC (rev 202346)
</span><span class="lines">@@ -0,0 +1,91 @@
</span><ins>+/*
+ * Copyright (C) 2015 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.
+ */
+
+#import "WebPaymentCoordinatorClient.h"
+
+#if ENABLE(APPLE_PAY)
+
+#import <WebCore/URL.h>
+#import <wtf/MainThread.h>
+
+WebPaymentCoordinatorClient::WebPaymentCoordinatorClient()
+{
+}
+
+WebPaymentCoordinatorClient::~WebPaymentCoordinatorClient()
+{
+}
+
+bool WebPaymentCoordinatorClient::supportsVersion(unsigned)
+{
+ return false;
+}
+
+bool WebPaymentCoordinatorClient::canMakePayments()
+{
+ return false;
+}
+
+void WebPaymentCoordinatorClient::canMakePaymentsWithActiveCard(const String&, const String&, std::function<void (bool)> completionHandler)
+{
+ callOnMainThread([completionHandler] {
+ completionHandler(false);
+ });
+}
+
+void WebPaymentCoordinatorClient::showPaymentUI(const WebCore::URL&, const Vector<WebCore::URL>&, const WebCore::PaymentRequest&)
+{
+}
+
+void WebPaymentCoordinatorClient::completeMerchantValidation(const WebCore::PaymentMerchantSession&)
+{
+}
+
+void WebPaymentCoordinatorClient::completeShippingMethodSelection(WebCore::PaymentAuthorizationStatus, Optional<WebCore::PaymentRequest::TotalAndLineItems>)
+{
+}
+
+void WebPaymentCoordinatorClient::completeShippingContactSelection(WebCore::PaymentAuthorizationStatus, const Vector<WebCore::PaymentRequest::ShippingMethod>&, Optional<WebCore::PaymentRequest::TotalAndLineItems>)
+{
+}
+
+void WebPaymentCoordinatorClient::completePaymentMethodSelection(Optional<WebCore::PaymentRequest::TotalAndLineItems>)
+{
+}
+
+void WebPaymentCoordinatorClient::completePaymentSession(WebCore::PaymentAuthorizationStatus)
+{
+}
+
+void WebPaymentCoordinatorClient::abortPaymentSession()
+{
+}
+
+void WebPaymentCoordinatorClient::mainFrameDestroyed()
+{
+ delete this;
+}
+
+#endif
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebKitAdditionsmm"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit/mac/WebKitAdditions.mm (202345 => 202346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKitAdditions.mm 2016-06-22 20:00:03 UTC (rev 202345)
+++ trunk/Source/WebKit/mac/WebKitAdditions.mm 2016-06-22 20:38:15 UTC (rev 202346)
</span><span class="lines">@@ -1,28 +0,0 @@
</span><del>-/*
- * Copyright (C) 2016 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.
- */
-
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebKitLegacyAdditions.cpp>
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (202345 => 202346)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-06-22 20:00:03 UTC (rev 202345)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-06-22 20:38:15 UTC (rev 202346)
</span><span class="lines">@@ -89,6 +89,7 @@
</span><span class="cx"> #import "WebNodeHighlight.h"
</span><span class="cx"> #import "WebNotificationClient.h"
</span><span class="cx"> #import "WebPDFView.h"
</span><ins>+#import "WebPaymentCoordinatorClient.h"
</ins><span class="cx"> #import "WebPlatformStrategies.h"
</span><span class="cx"> #import "WebPluginDatabase.h"
</span><span class="cx"> #import "WebPolicyDelegate.h"
</span><span class="lines">@@ -298,9 +299,6 @@
</span><span class="cx"> #import <WebCore/WebMediaSessionManagerMac.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebViewIncludes.h>
-#endif
</del><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
</span><span class="cx"> #import <WebCore/WebPlaybackSessionInterfaceMac.h>
</span><span class="lines">@@ -1001,6 +999,10 @@
</span><span class="cx"> pageConfiguration.inspectorClient = new WebInspectorClient(self);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(APPLE_PAY)
+ pageConfiguration.paymentCoordinatorClient = new WebPaymentCoordinatorClient();
+#endif
+
</ins><span class="cx"> #if USE(APPLE_INTERNAL_SDK)
</span><span class="cx"> #import <WebKitAdditions/WebViewInitialization.mm>
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>