<!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>[202444] trunk/Source</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/202444">202444</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-06-24 13:49:31 -0700 (Fri, 24 Jun 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Inline more of the Apple Pay source code
https://bugs.webkit.org/show_bug.cgi?id=159099
Reviewed by Andreas Kling.
Source/WebCore:
* page/Settings.h:
(WebCore::Settings::applePayEnabled):
(WebCore::Settings::setApplePayEnabled):
(WebCore::Settings::applePayCapabilityDisclosureAllowed):
(WebCore::Settings::setApplePayCapabilityDisclosureAllowed):
Source/WebKit2:
* Shared/Cocoa/WebCoreArgumentCodersCocoa.h: Removed.
* Shared/WebCoreArgumentCoders.h:
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/Cocoa/WKPreferences.mm:
(-[WKPreferences _applePayCapabilityDisclosureAllowed]):
(-[WKPreferences _setApplePayCapabilityDisclosureAllowed:]):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _applePayEnabled]):
(-[WKWebViewConfiguration _setApplePayEnabled:]):
(-[WKWebViewConfiguration _paymentsEnabled]):
(-[WKWebViewConfiguration _setPaymentsEnabled:]):
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::reattachToWebProcess):
(WebKit::WebPageProxy::resetState):
* UIProcess/WebPageProxy.h:
* WebKit2.xcodeproj/project.pbxproj:
* WebProcess/WebPage/WebPage.cpp:
(WebKit::m_userInterfaceLayoutDirection):
(WebKit::WebPage::updatePreferences):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2SharedCocoaWebCoreArgumentCodersCocoah">trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebCore/ChangeLog 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2016-06-24 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Inline more of the Apple Pay source code
+ https://bugs.webkit.org/show_bug.cgi?id=159099
+
+ Reviewed by Andreas Kling.
+
+ * page/Settings.h:
+ (WebCore::Settings::applePayEnabled):
+ (WebCore::Settings::setApplePayEnabled):
+ (WebCore::Settings::applePayCapabilityDisclosureAllowed):
+ (WebCore::Settings::setApplePayCapabilityDisclosureAllowed):
+
+2016-06-24 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Windows build fix.
</span><span class="cx">
</span><span class="cx"> * platform/GenericTaskQueue.h:
</span></span></pre></div>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebCore/page/Settings.h 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -289,6 +289,14 @@
</span><span class="cx"> WEBCORE_EXPORT static void setMockCaptureDevicesEnabled(bool);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(APPLE_PAY)
+ bool applePayEnabled() const { return m_applePayEnabled; }
+ void setApplePayEnabled(bool applePayEnabled) { m_applePayEnabled = applePayEnabled; }
+
+ bool applePayCapabilityDisclosureAllowed() const { return m_applePayCapabilityDisclosureAllowed; }
+ void setApplePayCapabilityDisclosureAllowed(bool applePayCapabilityDisclosureAllowed) { m_applePayCapabilityDisclosureAllowed = applePayCapabilityDisclosureAllowed; }
+#endif
+
</ins><span class="cx"> WEBCORE_EXPORT void setForcePendingWebGLPolicy(bool);
</span><span class="cx"> bool isForcePendingWebGLPolicy() const { return m_forcePendingWebGLPolicy; }
</span><span class="cx">
</span><span class="lines">@@ -295,10 +303,6 @@
</span><span class="cx"> WEBCORE_EXPORT static void setAllowsAnySSLCertificate(bool);
</span><span class="cx"> static bool allowsAnySSLCertificate();
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/SettingsGettersAndSetters.h>
-#endif
-
</del><span class="cx"> private:
</span><span class="cx"> explicit Settings(Page*);
</span><span class="cx">
</span><span class="lines">@@ -390,13 +394,14 @@
</span><span class="cx"> static bool gMockCaptureDevicesEnabled;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if ENABLE(APPLE_PAY)
+ bool m_applePayEnabled { false };
+ bool m_applePayCapabilityDisclosureAllowed { true };
+#endif
+
</ins><span class="cx"> static bool gLowPowerVideoAudioBufferSizeEnabled;
</span><span class="cx"> static bool gResourceLoadStatisticsEnabledEnabled;
</span><span class="cx"> static bool gAllowsAnySSLCertificate;
</span><del>-
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/SettingsMembers.h>
-#endif
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/ChangeLog 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-06-24 Anders Carlsson <andersca@apple.com>
+
+ Inline more of the Apple Pay source code
+ https://bugs.webkit.org/show_bug.cgi?id=159099
+
+ Reviewed by Andreas Kling.
+
+ * Shared/Cocoa/WebCoreArgumentCodersCocoa.h: Removed.
+ * Shared/WebCoreArgumentCoders.h:
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKPreferences.mm:
+ (-[WKPreferences _applePayCapabilityDisclosureAllowed]):
+ (-[WKPreferences _setApplePayCapabilityDisclosureAllowed:]):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _applePayEnabled]):
+ (-[WKWebViewConfiguration _setApplePayEnabled:]):
+ (-[WKWebViewConfiguration _paymentsEnabled]):
+ (-[WKWebViewConfiguration _setPaymentsEnabled:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::reattachToWebProcess):
+ (WebKit::WebPageProxy::resetState):
+ * UIProcess/WebPageProxy.h:
+ * WebKit2.xcodeproj/project.pbxproj:
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::m_userInterfaceLayoutDirection):
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2016-06-21 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Rename NoncopyableFunction to Function
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWebCoreArgumentCodersCocoah"></a>
<div class="delfile"><h4>Deleted: trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.h (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.h 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/Shared/Cocoa/WebCoreArgumentCodersCocoa.h 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -1,91 +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.
- */
-
-#pragma once
-
-#if ENABLE(APPLE_PAY)
-
-#include <WebCore/PaymentHeaders.h>
-
-namespace IPC {
-
-template<> struct ArgumentCoder<WebCore::Payment> {
- static void encode(ArgumentEncoder&, const WebCore::Payment&);
- static bool decode(ArgumentDecoder&, WebCore::Payment&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentContact> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentContact&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentContact&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentMerchantSession> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentMerchantSession&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentMerchantSession&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentMethod> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentMethod&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentMethod&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentRequest> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentRequest::AddressFields> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::AddressFields&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::AddressFields&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentRequest::LineItem> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::LineItem&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::LineItem&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentRequest::MerchantCapabilities> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::MerchantCapabilities&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::MerchantCapabilities&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentRequest::ShippingMethod> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::ShippingMethod&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ShippingMethod&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentRequest::SupportedNetworks> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::SupportedNetworks&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::SupportedNetworks&);
-};
-
-template<> struct ArgumentCoder<WebCore::PaymentRequest::TotalAndLineItems> {
- static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::TotalAndLineItems&);
- static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::TotalAndLineItems&);
-};
-
-}
-
-#endif
</del></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -27,6 +27,7 @@
</span><span class="cx"> #define WebCoreArgumentCoders_h
</span><span class="cx">
</span><span class="cx"> #include "ArgumentCoders.h"
</span><ins>+#include <WebCore/PaymentHeaders.h>
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class AffineTransform;
</span><span class="lines">@@ -473,10 +474,65 @@
</span><span class="cx"> static bool decode(ArgumentDecoder&, WebCore::ResourceLoadStatistics&);
</span><span class="cx"> };
</span><span class="cx">
</span><del>-} // namespace IPC
</del><ins>+#if ENABLE(APPLE_PAY)
</ins><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebCoreArgumentCodersAdditions.h>
</del><ins>+template<> struct ArgumentCoder<WebCore::Payment> {
+ static void encode(ArgumentEncoder&, const WebCore::Payment&);
+ static bool decode(ArgumentDecoder&, WebCore::Payment&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentContact> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentContact&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentContact&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentMerchantSession> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentMerchantSession&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentMerchantSession&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentMethod> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentMethod&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentMethod&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentRequest> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentRequest::AddressFields> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::AddressFields&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::AddressFields&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentRequest::LineItem> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::LineItem&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::LineItem&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentRequest::MerchantCapabilities> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::MerchantCapabilities&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::MerchantCapabilities&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentRequest::ShippingMethod> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::ShippingMethod&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::ShippingMethod&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentRequest::SupportedNetworks> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::SupportedNetworks&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::SupportedNetworks&);
+};
+
+template<> struct ArgumentCoder<WebCore::PaymentRequest::TotalAndLineItems> {
+ static void encode(ArgumentEncoder&, const WebCore::PaymentRequest::TotalAndLineItems&);
+ static bool decode(ArgumentDecoder&, WebCore::PaymentRequest::TotalAndLineItems&);
+};
+
</ins><span class="cx"> #endif
</span><span class="cx">
</span><ins>+} // namespace IPC
+
</ins><span class="cx"> #endif // WebCoreArgumentCoders_h
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -26,14 +26,6 @@
</span><span class="cx"> #ifndef WebPreferencesDefinitions_h
</span><span class="cx"> #define WebPreferencesDefinitions_h
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebPreferencesDefinitionsAdditions.h>
-#endif
-
-#if !defined(FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE)
-#define FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro)
-#endif
-
</del><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
</span><span class="cx"> #else
</span><span class="lines">@@ -236,7 +228,8 @@
</span><span class="cx"> macro(FetchAPIEnabled, fetchAPIEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(DownloadAttributeEnabled, downloadAttributeEnabled, Bool, bool, false, "", "") \
</span><span class="cx"> macro(SelectionPaintingWithoutSelectionGapsEnabled, selectionPaintingWithoutSelectionGapsEnabled, Bool, bool, DEFAULT_SELECTION_PAINTING_WITHOUT_SELECTION_GAPS_ENABLED, "", "") \
</span><del>- FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro) \
</del><ins>+ macro(ApplePayEnabled, applePayEnabled, Bool, bool, false, "", "") \
+ macro(ApplePayCapabilityDisclosureAllowed, applePayCapabilityDisclosureAllowed, Bool, bool, true, "", "") \
</ins><span class="cx"> \
</span><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.mm 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -449,10 +449,22 @@
</span><span class="cx"> _preferences->setEnabledForFeature(value, *feature->_experimentalFeature);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKPreferencesPrivateMethods.mm>
</del><ins>+- (BOOL)_applePayCapabilityDisclosureAllowed
+{
+#if ENABLE(APPLE_PAY)
+ return _preferences->applePayCapabilityDisclosureAllowed();
+#else
+ return NO;
</ins><span class="cx"> #endif
</span><ins>+}
</ins><span class="cx">
</span><ins>+- (void)_setApplePayCapabilityDisclosureAllowed:(BOOL)applePayCapabilityDisclosureAllowed
+{
+#if ENABLE(APPLE_PAY)
+ _preferences->setApplePayCapabilityDisclosureAllowed(applePayCapabilityDisclosureAllowed);
+#endif
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -480,8 +480,8 @@
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsAirPlayForMediaPlayback]));
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewInitialization.mm>
</del><ins>+#if ENABLE(APPLE_PAY)
+ pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::applePayEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _applePayEnabled]));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -124,8 +124,8 @@
</span><span class="cx"> #endif
</span><span class="cx"> BOOL _initialCapitalizationEnabled;
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewConfigurationIvars.mm>
</del><ins>+#if ENABLE(APPLE_PAY)
+ BOOL _applePayEnabled;
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -303,9 +303,8 @@
</span><span class="cx"> #if ENABLE(WIRELESS_TARGET_PLAYBACK)
</span><span class="cx"> configuration->_allowsAirPlayForMediaPlayback = self->_allowsAirPlayForMediaPlayback;
</span><span class="cx"> #endif
</span><del>-
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewConfigurationCopy.mm>
</del><ins>+#if ENABLE(APPLE_PAY)
+ configuration->_applePayEnabled = self->_applePayEnabled;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> return configuration;
</span><span class="lines">@@ -705,10 +704,32 @@
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WKWebViewConfigurationPrivateMethods.mm>
</del><ins>+- (BOOL)_applePayEnabled
+{
+#if ENABLE(APPLE_PAY)
+ return _applePayEnabled;
+#else
+ return NO;
</ins><span class="cx"> #endif
</span><ins>+}
</ins><span class="cx">
</span><ins>+- (void)_setApplePayEnabled:(BOOL)applePayEnabled
+{
+#if ENABLE(APPLE_PAY)
+ _applePayEnabled = applePayEnabled;
+#endif
+}
+
+- (BOOL)_paymentsEnabled
+{
+ return self._applePayEnabled;
+}
+
+- (void)_setPaymentsEnabled:(BOOL)paymentsEnabled
+{
+ [self _setApplePayEnabled:paymentsEnabled];
+}
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKWebViewConfiguration (WKDeprecated)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setMediaDataLoadsAutomatically:) BOOL _mediaDataLoadsAutomatically WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx"> @property (nonatomic, setter=_setAttachmentElementEnabled:) BOOL _attachmentElementEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><span class="cx"> @property (nonatomic, setter=_setInitialCapitalizationEnabled:) BOOL _initialCapitalizationEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</span><ins>+@property (nonatomic, setter=_setApplePayEnabled:) BOOL _applePayEnabled WK_AVAILABLE(WK_MAC_TBA, WK_IOS_TBA);
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_AVAILABLE(NA, 9_0);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -480,8 +480,8 @@
</span><span class="cx"> m_vibration = WebVibrationProxy::create(this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebPageProxyInitialization.cpp>
</del><ins>+#if ENABLE(APPLE_PAY)
+ m_paymentCoordinator = std::make_unique<WebPaymentCoordinatorProxy>(*this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, *this);
</span><span class="lines">@@ -715,8 +715,8 @@
</span><span class="cx"> m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this, *m_playbackSessionManager);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebPageProxyInitialization.cpp>
</del><ins>+#if ENABLE(APPLE_PAY)
+ m_paymentCoordinator = std::make_unique<WebPaymentCoordinatorProxy>(*this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> initializeWebPage();
</span><span class="lines">@@ -5202,8 +5202,8 @@
</span><span class="cx"> m_pageClient.mediaSessionManager().removeAllPlaybackTargetPickerClients(*this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebPageProxyInvalidation.cpp>
</del><ins>+#if ENABLE(APPLE_PAY)
+ m_paymentCoordinator = nullptr;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CallbackBase::Error error;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -1584,8 +1584,8 @@
</span><span class="cx"> RefPtr<WebVibrationProxy> m_vibration;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebPageProxyMembers.h>
</del><ins>+#if ENABLE(APPLE_PAY)
+ std::unique_ptr<WebPaymentCoordinatorProxy> m_paymentCoordinator;
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> CallbackMap m_callbacks;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -390,7 +390,6 @@
</span><span class="cx"> 1AB1F78B1D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F7881D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.cpp */; };
</span><span class="cx"> 1AB1F78C1D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F7891D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.h */; };
</span><span class="cx"> 1AB1F7901D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F78E1D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.mm */; };
</span><del>- 1AB1F7911D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F78F1D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.h */; };
</del><span class="cx"> 1AB1F7961D1B3613007C9BD1 /* WebPaymentCoordinatorMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F7921D1B3613007C9BD1 /* WebPaymentCoordinatorMessageReceiver.cpp */; };
</span><span class="cx"> 1AB1F7971D1B3613007C9BD1 /* WebPaymentCoordinatorMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1AB1F7931D1B3613007C9BD1 /* WebPaymentCoordinatorMessages.h */; };
</span><span class="cx"> 1AB1F7981D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1AB1F7941D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessageReceiver.cpp */; };
</span><span class="lines">@@ -2379,11 +2378,10 @@
</span><span class="cx"> 1AB1F7891D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPaymentCoordinatorProxy.h; sourceTree = "<group>"; };
</span><span class="cx"> 1AB1F78A1D1B3355007C9BD1 /* WebPaymentCoordinatorProxy.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = WebPaymentCoordinatorProxy.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1AB1F78E1D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreArgumentCodersCocoa.mm; sourceTree = "<group>"; };
</span><del>- 1AB1F78F1D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebCoreArgumentCodersCocoa.h; sourceTree = "<group>"; };
- 1AB1F7921D1B3613007C9BD1 /* WebPaymentCoordinatorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPaymentCoordinatorMessageReceiver.cpp; path = WebPaymentCoordinatorMessageReceiver.cpp; sourceTree = "<group>"; };
- 1AB1F7931D1B3613007C9BD1 /* WebPaymentCoordinatorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebPaymentCoordinatorMessages.h; path = WebPaymentCoordinatorMessages.h; sourceTree = "<group>"; };
- 1AB1F7941D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebPaymentCoordinatorProxyMessageReceiver.cpp; path = WebPaymentCoordinatorProxyMessageReceiver.cpp; sourceTree = "<group>"; };
- 1AB1F7951D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebPaymentCoordinatorProxyMessages.h; path = WebPaymentCoordinatorProxyMessages.h; sourceTree = "<group>"; };
</del><ins>+ 1AB1F7921D1B3613007C9BD1 /* WebPaymentCoordinatorMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPaymentCoordinatorMessageReceiver.cpp; sourceTree = "<group>"; };
+ 1AB1F7931D1B3613007C9BD1 /* WebPaymentCoordinatorMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPaymentCoordinatorMessages.h; sourceTree = "<group>"; };
+ 1AB1F7941D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebPaymentCoordinatorProxyMessageReceiver.cpp; sourceTree = "<group>"; };
+ 1AB1F7951D1B3613007C9BD1 /* WebPaymentCoordinatorProxyMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPaymentCoordinatorProxyMessages.h; sourceTree = "<group>"; };
</ins><span class="cx"> 1AB31A9316BC65AB00F6DBC9 /* StorageManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = StorageManager.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1AB31A9416BC688100F6DBC9 /* StorageManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = StorageManagerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1AB31A9516BC688100F6DBC9 /* StorageManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StorageManagerMessages.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5241,8 +5239,6 @@
</span><span class="cx"> 37C4C0901814B37B003688B9 /* cocoa */ = {
</span><span class="cx"> isa = PBXGroup;
</span><span class="cx"> children = (
</span><del>- 1AB1F78E1D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.mm */,
- 1AB1F78F1D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.h */,
</del><span class="cx"> 1A1EF1971A1D5B420023200A /* APIDataCocoa.mm */,
</span><span class="cx"> 378E1A3B181ED6FF0031007A /* APIObject.mm */,
</span><span class="cx"> 37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */,
</span><span class="lines">@@ -5249,6 +5245,7 @@
</span><span class="cx"> 37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */,
</span><span class="cx"> C55F916C1C595E440029E92D /* DataDetectionResult.h */,
</span><span class="cx"> C55F916D1C595E440029E92D /* DataDetectionResult.mm */,
</span><ins>+ 1AB1F78E1D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.mm */,
</ins><span class="cx"> 37C4C0921814B3AF003688B9 /* WKNSArray.h */,
</span><span class="cx"> 37C4C0911814B3AF003688B9 /* WKNSArray.mm */,
</span><span class="cx"> 373CEAD4185417AE008C363D /* WKNSData.h */,
</span><span class="lines">@@ -8139,7 +8136,6 @@
</span><span class="cx"> 1AD01BCD1905D54900C9C45F /* WKReloadFrameErrorRecoveryAttempter.h in Headers */,
</span><span class="cx"> 1A9E329B1822E1CC00F5D04C /* WKRemoteObject.h in Headers */,
</span><span class="cx"> 1A9E329F1822FEDD00F5D04C /* WKRemoteObjectCoder.h in Headers */,
</span><del>- 1AB1F7911D1B34A6007C9BD1 /* WebCoreArgumentCodersCocoa.h in Headers */,
</del><span class="cx"> 37948409150C4B9700E52CE9 /* WKRenderLayer.h in Headers */,
</span><span class="cx"> 37608823150414F700FC82C7 /* WKRenderObject.h in Headers */,
</span><span class="cx"> 3336763B130C99DC006C9DE2 /* WKResourceCacheManager.h in Headers */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (202443 => 202444)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-06-24 20:30:04 UTC (rev 202443)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-06-24 20:49:31 UTC (rev 202444)
</span><span class="lines">@@ -92,6 +92,7 @@
</span><span class="cx"> #include "WebPageMessages.h"
</span><span class="cx"> #include "WebPageOverlay.h"
</span><span class="cx"> #include "WebPageProxyMessages.h"
</span><ins>+#include "WebPaymentCoordinator.h"
</ins><span class="cx"> #include "WebPlugInClient.h"
</span><span class="cx"> #include "WebPopupMenu.h"
</span><span class="cx"> #include "WebPreferencesDefinitions.h"
</span><span class="lines">@@ -239,10 +240,6 @@
</span><span class="cx"> #include <WebCore/MediaPlayerRequestInstallMissingPluginsCallback.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebPageIncludes.h>
-#endif
-
</del><span class="cx"> using namespace JSC;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -412,8 +409,8 @@
</span><span class="cx"> pageConfiguration.userContentProvider = m_userContentController.ptr();
</span><span class="cx"> pageConfiguration.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebPageInitialization.h>
</del><ins>+#if ENABLE(APPLE_PAY)
+ pageConfiguration.paymentCoordinatorClient = new WebPaymentCoordinator(*this);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_page = std::make_unique<Page>(WTFMove(pageConfiguration));
</span><span class="lines">@@ -3108,8 +3105,9 @@
</span><span class="cx"> if (systemLayoutDirectionCandidate == WebCore::LTR || systemLayoutDirectionCandidate == WebCore::RTL)
</span><span class="cx"> settings.setSystemLayoutDirection(systemLayoutDirectionCandidate);
</span><span class="cx">
</span><del>-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/WebPagePreferences.cpp>
</del><ins>+#if ENABLE(APPLE_PAY)
+ settings.setApplePayEnabled(store.getBoolValueForKey(WebPreferencesKey::applePayEnabledKey()));
+ settings.setApplePayCapabilityDisclosureAllowed(store.getBoolValueForKey(WebPreferencesKey::applePayCapabilityDisclosureAllowedKey()));
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span></span></pre>
</div>
</div>
</body>
</html>