Attachment 356178 Details for Bug 192131 – Patch

[patch] Patch

bug-192131-20181130074922.patch (text/plain), 25.13 KB, created by Andy Estes on 2018-11-30 07:49:23 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Andy Estes

Created: 2018-11-30 07:49:23 PST

Size: 25.13 KB

patch

obsolete

>Subversion Revision: 238723
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 7bd99f397657f20976f4ba34c47db062b4ecd1a9..f7a4e20c8b1a514179705abaa1a322b35f8e18ef 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,20 @@
>+2018-11-30  Andy Estes  <aestes@apple.com>
>+
>+        [Cocoa] Add some WKA extension points
>+        https://bugs.webkit.org/show_bug.cgi?id=192131
>+        <rdar://problem/46330293>
>+
>+        Reviewed by Tim Horton.
>+
>+        * DerivedSources.make: Added an extension point for derived sources.
>+        * Modules/applepay/PaymentCoordinatorClient.h: Added an extension point for
>+        PaymentCoordinatorClient.
>+        * SourcesCocoa.txt: Added WebCoreAdditions.mm as a non-unified source.
>+        * WebCore.xcodeproj/project.pbxproj: Added WebCoreAdditions.mm.
>+        * bindings/js/WebCoreBuiltinNames.h: Added an extension point for built-in names.
>+        * page/SettingsBase.h: Added an extension point for settings.
>+        * platform/cocoa/WebCoreAdditions.mm: Added.
>+
> 2018-11-29  Christopher Reid  <chris.reid@sony.com>
> 
>         [Win] listDirectory in FileSystemWin.cpp should not skip all directories
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 45c5dda11f9abe7b2d68a70a30fad9b4d638f2c5..da0fbc98a3398b75dae3020ef9dfc02533b41c7a 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,24 @@
>+2018-11-30  Andy Estes  <aestes@apple.com>
>+
>+        [Cocoa] Add some WKA extension points
>+        https://bugs.webkit.org/show_bug.cgi?id=192131
>+        <rdar://problem/46330293>
>+
>+        Reviewed by Tim Horton.
>+
>+        * DerivedSources.make: Added an extension point for WebPreferences.yaml.
>+        * Platform/IPC/MessageSender.h:
>+        (IPC::MessageSender::sendWithAsyncReply): Send async messages via IPC::MessageSender.
>+        * Platform/cocoa/WebKitAdditions.mm: A an extension point for additional WebKit sources.
>+        * SourcesCocoa.txt: Added WebKitAdditions.mm as non-unified source.
>+        * UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp:
>+        (WebKit::WebPaymentCoordinatorProxy::WebPaymentCoordinatorProxy): Called finishConstruction.
>+        * UIProcess/ApplePay/WebPaymentCoordinatorProxy.h: Added an extension point for
>+        WebPaymentCoordinatorProxy.
>+        * WebKit.xcodeproj/project.pbxproj: Added WebKitAdditions.mm.
>+        * WebProcess/ApplePay/WebPaymentCoordinator.h: Added an extension point for
>+        WebPaymentCoordinator.
>+
> 2018-11-29  Ryan Haddad  <ryanhaddad@apple.com>
> 
>         Unreviewed, rolling out r238713.
>diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
>index 7791a4c134e62ccaf35e4c8ce9b982ef0f6d467b..ab063fcc77a52dc38482d34f58206bf8be890892 100644
>--- a/Source/WebCore/DerivedSources.make
>+++ b/Source/WebCore/DerivedSources.make
>@@ -1149,6 +1149,8 @@ vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
> ADDITIONAL_EVENT_NAMES =
> ADDITIONAL_EVENT_TARGET_FACTORY =
> 
>+-include WebCoreDerivedSourcesAdditions.make
>+
> JS_BINDING_IDLS += $(ADDITIONAL_BINDING_IDLS)
> 
> all : $(ADDITIONAL_BINDING_IDLS:%.idl=JS%.h)
>diff --git a/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h b/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h
>index b97030aa0524e58d2bd953af23d77afcb316f4f9..80198f2471b348e70a111607a351a320700732b0 100644
>--- a/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h
>+++ b/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h
>@@ -31,6 +31,10 @@
> #include <wtf/Forward.h>
> #include <wtf/Function.h>
> 
>+#if USE(APPLE_INTERNAL_SDK)
>+#import <WebKitAdditions/PaymentCoordinatorClientAdditions.h>
>+#endif
>+
> namespace WebCore {
> 
> class PaymentMerchantSession;
>@@ -62,6 +66,11 @@ public:
> 
> protected:
>     virtual ~PaymentCoordinatorClient() = default;
>+
>+#if defined(PAYMENTCOORDINATORCLIENT_ADDITIONS)
>+PAYMENTCOORDINATORCLIENT_ADDITIONS
>+#undef PAYMENTCOORDINATORCLIENT_ADDITIONS
>+#endif
> };
> 
> }
>diff --git a/Source/WebCore/SourcesCocoa.txt b/Source/WebCore/SourcesCocoa.txt
>index 062cdd7f07d70e30d9f06f30573d697fbff15b6f..3a318eabcdff98f9c76588fbcf26e29ebeac703b 100644
>--- a/Source/WebCore/SourcesCocoa.txt
>+++ b/Source/WebCore/SourcesCocoa.txt
>@@ -213,6 +213,7 @@ platform/cocoa/ThemeCocoa.mm
> platform/cocoa/UserAgentCocoa.mm
> platform/cocoa/VideoFullscreenModelVideoElement.mm
> platform/cocoa/VideoToolboxSoftLink.cpp
>+platform/cocoa/WebCoreAdditions.mm @no-unify
> platform/cocoa/WebCoreNSErrorExtras.mm
> 
> platform/gamepad/cocoa/GameControllerGamepad.mm
>diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>index a2e306dab724bc276ed5c0fc62ac41cc56059451..236d77dd17f1229a4b4a3338a995677677798851 100644
>--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
>@@ -2992,6 +2992,7 @@
> 		A17C81230F2A5CF7005DAAEB /* HTMLElementFactory.h in Headers */ = {isa = PBXBuildFile; fileRef = A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */; };
> 		A17D275E1EAC579800BF01E7 /* MediaSelectionOption.h in Headers */ = {isa = PBXBuildFile; fileRef = A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A17FEE641F8893220021E811 /* PaymentSessionBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A17FEE631F8893220021E811 /* PaymentSessionBase.h */; };
>+		A180AD5B219F81B000DC039A /* WebCoreAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A17E4F26219BC01600E1C7EE /* WebCoreAdditions.mm */; };
> 		A185B42A1E8211A100DC9118 /* PreviewLoader.h in Headers */ = {isa = PBXBuildFile; fileRef = A185B4281E8211A100DC9118 /* PreviewLoader.h */; settings = {ATTRIBUTES = (Private, ); }; };
> 		A18890AF1AA13F250026C301 /* ParentalControlsContentFilter.h in Headers */ = {isa = PBXBuildFile; fileRef = A18890AD1AA13F250026C301 /* ParentalControlsContentFilter.h */; };
> 		A19AEA211AAA808600B52B25 /* JSMockContentFilterSettings.h in Headers */ = {isa = PBXBuildFile; fileRef = A19AEA1E1AAA806E00B52B25 /* JSMockContentFilterSettings.h */; };
>@@ -11131,6 +11132,7 @@
> 		A17C81200F2A5CF7005DAAEB /* HTMLElementFactory.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = HTMLElementFactory.cpp; path = DerivedSources/WebCore/HTMLElementFactory.cpp; sourceTree = BUILT_PRODUCTS_DIR; };
> 		A17C81210F2A5CF7005DAAEB /* HTMLElementFactory.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = HTMLElementFactory.h; path = DerivedSources/WebCore/HTMLElementFactory.h; sourceTree = BUILT_PRODUCTS_DIR; };
> 		A17D275D1EAC579800BF01E7 /* MediaSelectionOption.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MediaSelectionOption.h; sourceTree = "<group>"; };
>+		A17E4F26219BC01600E1C7EE /* WebCoreAdditions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebCoreAdditions.mm; sourceTree = "<group>"; };
> 		A17FEE631F8893220021E811 /* PaymentSessionBase.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = PaymentSessionBase.h; sourceTree = "<group>"; };
> 		A182D5B61BE722620087A7CC /* SettingsBaseCocoa.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = SettingsBaseCocoa.mm; sourceTree = "<group>"; };
> 		A185B4271E8211A100DC9118 /* PreviewLoader.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = PreviewLoader.mm; sourceTree = "<group>"; };
>@@ -22143,6 +22145,7 @@
> 				52D5A1A61C57488900DE34A3 /* VideoFullscreenModelVideoElement.mm */,
> 				CDC939A51E9BDFB100BB768D /* VideoToolboxSoftLink.cpp */,
> 				CDC939A61E9BDFB100BB768D /* VideoToolboxSoftLink.h */,
>+				A17E4F26219BC01600E1C7EE /* WebCoreAdditions.mm */,
> 				CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
> 				CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
> 				5DFEBAB618592B6D00C75BEB /* WebKitAvailability.h */,
>@@ -32928,6 +32931,7 @@
> 				A14832B9187F63D500DA63A6 /* WAKView.mm in Sources */,
> 				DE5F861E1FA281FD006DB63A /* WebAccessibilityObjectWrapperBase.mm in Sources */,
> 				DE5F861D1FA2815B006DB63A /* WebAccessibilityObjectWrapperMac.mm in Sources */,
>+				A180AD5B219F81B000DC039A /* WebCoreAdditions.mm in Sources */,
> 				CD7E05221651C28200C1201F /* WebCoreAVFResourceLoader.mm in Sources */,
> 				CD225C0B1C46FBF400140761 /* WebCoreNSURLSession.mm in Sources */,
> 				93F19B0708245E59001E9ABC /* WebCoreView.m in Sources */,
>diff --git a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
>index ca7c60392fcd5479420843d980f711d99bb40537..9f614c2f51d6ed278a9199ec8e84f9412dcd3137 100644
>--- a/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
>+++ b/Source/WebCore/bindings/js/WebCoreBuiltinNames.h
>@@ -1,5 +1,6 @@
> /*
>  *  Copyright (c) 2015, Canon Inc. All rights reserved.
>+ *  Copyright (C) 2018 Apple Inc. All rights reserved.
>  *
>  *  Redistribution and use in source and binary forms, with or without
>  *  modification, are permitted provided that the following conditions
>@@ -28,8 +29,16 @@
> 
> #include <JavaScriptCore/BuiltinUtils.h>
> 
>+#if USE(APPLE_INTERNAL_SDK)
>+#include <WebKitAdditions/WebCoreBuiltinNamesAdditions.h>
>+#endif
>+
> namespace WebCore {
> 
>+#if !defined(WEBCORE_ADDITIONAL_PRIVATE_IDENTIFIERS)
>+#define WEBCORE_ADDITIONAL_PRIVATE_IDENTIFIERS(macro)
>+#endif
>+
> #define WEBCORE_COMMON_PRIVATE_IDENTIFIERS_EACH_PROPERTY_NAME(macro) \
>     macro(Animation) \
>     macro(AnimationEffect) \
>@@ -341,7 +350,8 @@ namespace WebCore {
>     macro(webkitIndexedDB) \
>     macro(webgpu) \
>     macro(window) \
>-    macro(writing)
>+    macro(writing) \
>+    WEBCORE_ADDITIONAL_PRIVATE_IDENTIFIERS(macro) \
> 
> class WebCoreBuiltinNames {
> public:
>diff --git a/Source/WebCore/page/SettingsBase.h b/Source/WebCore/page/SettingsBase.h
>index bbc4ff63c6acfc9f35187914552870328ca83c22..fb143161546fd2f639e40ae167a15b725f612719 100644
>--- a/Source/WebCore/page/SettingsBase.h
>+++ b/Source/WebCore/page/SettingsBase.h
>@@ -207,6 +207,10 @@ protected:
>     float m_multiLineTextMultiplierCoefficient { defaultMultiLineTextMultiplierCoefficient };
>     float m_maxTextAutosizingScaleIncrease { defaultMaxTextAutosizingScaleIncrease };
> #endif
>+
>+#if USE(APPLE_INTERNAL_SDK)
>+#include <WebKitAdditions/SettingsAdditions.h>
>+#endif
> };
> 
> } // namespace WebCore
>diff --git a/Source/WebCore/platform/cocoa/WebCoreAdditions.mm b/Source/WebCore/platform/cocoa/WebCoreAdditions.mm
>new file mode 100644
>index 0000000000000000000000000000000000000000..af63da2f216be6e3652330a6f9c62ca7cf01fc75
>--- /dev/null
>+++ b/Source/WebCore/platform/cocoa/WebCoreAdditions.mm
>@@ -0,0 +1,30 @@
>+/*
>+ * Copyright (C) 2018 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 "config.h"
>+
>+#if USE(APPLE_INTERNAL_SDK)
>+#import <WebKitAdditions/WebCoreAdditions.mm>
>+#endif
>diff --git a/Source/WebKit/DerivedSources.make b/Source/WebKit/DerivedSources.make
>index 5efba05bf89457e7c5d94e52579a0d1bbd5d842e..f2d89192f6da7d2685e080ecab2129b93c44ba32 100644
>--- a/Source/WebKit/DerivedSources.make
>+++ b/Source/WebKit/DerivedSources.make
>@@ -1,4 +1,4 @@
>-# Copyright (C) 2010-2017 Apple Inc. All rights reserved.
>+# Copyright (C) 2010-2018 Apple Inc. All rights reserved.
> #
> # Redistribution and use in source and binary forms, with or without
> # modification, are permitted provided that the following conditions
>@@ -290,6 +290,12 @@ all : WebAutomationSessionProxyScriptSource.h
> 
> # WebPreferences generation
> 
>+WEB_PREFERENCES_INPUT_FILES = \
>+    $(WebKit2)/Shared/WebPreferences.yaml \
>+    $(ADDITIONAL_WEB_PREFERENCES_INPUT_FILES) \
>+#
>+WEB_PREFERENCES_COMBINED_INPUT_FILE = WebPreferencesCombined.yaml
>+
> WEB_PREFERENCES_TEMPLATES = \
>     $(WebKit2)/Scripts/PreferencesTemplates/WebPageUpdatePreferences.cpp.erb \
>     $(WebKit2)/Scripts/PreferencesTemplates/WebPreferencesDefinitions.h.erb \
>@@ -302,7 +308,10 @@ WEB_PREFERENCES_TEMPLATES = \
> WEB_PREFERENCES_FILES = $(basename $(notdir $(WEB_PREFERENCES_TEMPLATES)))
> WEB_PREFERENCES_PATTERNS = $(subst .,%,$(WEB_PREFERENCES_FILES))
> 
>-all : $(WEB_PREFERENCES_FILES)
>+all : $(WEB_PREFERENCES_FILES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
>+
>+$(WEB_PREFERENCES_COMBINED_INPUT_FILE) : $(WEB_PREFERENCES_INPUT_FILES)
>+	cat $^ > $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
> 
>-$(WEB_PREFERENCES_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WebKit2)/Shared/WebPreferences.yaml
>-	$(RUBY) $< --input $(WebKit2)/Shared/WebPreferences.yaml
>+$(WEB_PREFERENCES_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
>+	$(RUBY) $< --input $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
>diff --git a/Source/WebKit/Platform/IPC/MessageSender.h b/Source/WebKit/Platform/IPC/MessageSender.h
>index d8c30e23bd405ae77f6a4711514c04445b1f01c4..ec91d76263a71d6e657300e3e6ec0d25f09d37d5 100644
>--- a/Source/WebKit/Platform/IPC/MessageSender.h
>+++ b/Source/WebKit/Platform/IPC/MessageSender.h
>@@ -1,5 +1,5 @@
> /*
>- * Copyright (C) 2010-2016 Apple Inc. All rights reserved.
>+ * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
>  *
>  * Redistribution and use in source and binary forms, with or without
>  * modification, are permitted provided that the following conditions
>@@ -66,11 +66,9 @@ public:
>     }
> 
>     template<typename T, typename... Args>
>-    void sendWithAsyncReply(T&& message, CompletionHandler<void(Args...)>&& args, uint64_t destinationID = 0)
>+    void sendWithAsyncReply(T&& message, CompletionHandler<void(Args...)>&& completionHandler)
>     {
>-        ASSERT(messageSenderConnection());
>-
>-        messageSenderConnection()->sendWithAsyncReply(WTFMove(message), WTFMove(args), destinationID);
>+        messageSenderConnection()->sendWithAsyncReply(WTFMove(message), WTFMove(completionHandler), messageSenderDestinationID());
>     }
> 
>     virtual bool sendMessage(std::unique_ptr<Encoder>, OptionSet<SendOption>);
>diff --git a/Source/WebKit/Platform/cocoa/WebKitAdditions.mm b/Source/WebKit/Platform/cocoa/WebKitAdditions.mm
>new file mode 100644
>index 0000000000000000000000000000000000000000..55bfd992e7c38b0994beb80ddd932a4c5f3e795c
>--- /dev/null
>+++ b/Source/WebKit/Platform/cocoa/WebKitAdditions.mm
>@@ -0,0 +1,30 @@
>+/*
>+ * Copyright (C) 2018 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 "config.h"
>+
>+#if USE(APPLE_INTERNAL_SDK)
>+#import <WebKitAdditions/WebKitAdditions.mm>
>+#endif
>diff --git a/Source/WebKit/SourcesCocoa.txt b/Source/WebKit/SourcesCocoa.txt
>index 51f76c816fa7a82a7a2ebbefcdd280f6777f8cf9..55eaf591317889af066c522f46f3adee3dd226f1 100644
>--- a/Source/WebKit/SourcesCocoa.txt
>+++ b/Source/WebKit/SourcesCocoa.txt
>@@ -62,6 +62,7 @@ Platform/classifier/ResourceLoadStatisticsClassifier.cpp
> 
> Platform/cocoa/SharedMemoryCocoa.cpp
> Platform/cocoa/WKCrashReporter.mm
>+Platform/cocoa/WebKitAdditions.mm @no-unify
> 
> Platform/foundation/LoggingFoundation.mm
> 
>diff --git a/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp b/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp
>index 780a15e96d3c36246bb5d5a41c7127b2abdd131c..b44b7db1ea832d79bae9a47a2c5829159bfb6046 100644
>--- a/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp
>+++ b/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp
>@@ -44,6 +44,7 @@ WebPaymentCoordinatorProxy::WebPaymentCoordinatorProxy(WebPageProxy& webPageProx
>     , m_merchantValidationState(MerchantValidationState::Idle)
> {
>     m_webPageProxy.process().addMessageReceiver(Messages::WebPaymentCoordinatorProxy::messageReceiverName(), m_webPageProxy.pageID(), *this);
>+    finishConstruction(*this);
> }
> 
> WebPaymentCoordinatorProxy::~WebPaymentCoordinatorProxy()
>diff --git a/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h b/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h
>index 085019da06e32fb0f4ec58991535486feba7f8da..e03c70ab8b9c22598354116919f79eea3ac9f167 100644
>--- a/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h
>+++ b/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h
>@@ -33,6 +33,10 @@
> #include <wtf/RetainPtr.h>
> #include <wtf/WeakPtr.h>
> 
>+#if USE(APPLE_INTERNAL_SDK)
>+#import <WebKitAdditions/WebPaymentCoordinatorProxyAdditions.h>
>+#endif
>+
> namespace IPC {
> class DataReference;
> }
>@@ -150,6 +154,13 @@ private:
>     RetainPtr<NSWindow> m_sheetWindow;
>     RetainPtr<NSObject *> m_sheetWindowWillCloseObserver;
> #endif
>+    
>+#if defined(WEBPAYMENTCOORDINATORPROXY_ADDITIONS)
>+WEBPAYMENTCOORDINATORPROXY_ADDITIONS
>+#undef WEBPAYMENTCOORDINATORPROXY_ADDITIONS
>+#else
>+    void finishConstruction(WebPaymentCoordinatorProxy&) { }
>+#endif
> };
> 
> }
>diff --git a/Source/WebKit/WebKit.xcodeproj/project.pbxproj b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>index d288e3bec952fcd97dc40543dc31ff347d4ce883..ac94d9365f8b343ed74cc51bf6be2a9ba8c989d1 100644
>--- a/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>+++ b/Source/WebKit/WebKit.xcodeproj/project.pbxproj
>@@ -1270,6 +1270,7 @@
> 		A13DC682207AA6B20066EF72 /* WKApplicationStateTrackingView.h in Headers */ = {isa = PBXBuildFile; fileRef = A13DC680207AA6B20066EF72 /* WKApplicationStateTrackingView.h */; };
> 		A15EEDE61E301CEE000069B0 /* WKPasswordView.h in Headers */ = {isa = PBXBuildFile; fileRef = A15EEDE41E301CEE000069B0 /* WKPasswordView.h */; };
> 		A175C44A21AA3171000037D0 /* ArgumentCodersCocoa.h in Headers */ = {isa = PBXBuildFile; fileRef = A175C44921AA3170000037D0 /* ArgumentCodersCocoa.h */; };
>+		A181A79821ACC74B0059A316 /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = A181A79721ACAC610059A316 /* WebKitAdditions.mm */; };
> 		A182D5B51BE6BD250087A7CC /* AccessibilityIOS.h in Headers */ = {isa = PBXBuildFile; fileRef = A182D5B31BE6BD250087A7CC /* AccessibilityIOS.h */; };
> 		A19DD3C01D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = A19DD3BF1D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h */; };
> 		A1A4FE5A18DCE9FA00B5EA8A /* _WKDownload.h in Headers */ = {isa = PBXBuildFile; fileRef = A1A4FE5718DCE9FA00B5EA8A /* _WKDownload.h */; settings = {ATTRIBUTES = (Private, ); }; };
>@@ -3836,6 +3837,7 @@
> 		A15EEDE41E301CEE000069B0 /* WKPasswordView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WKPasswordView.h; path = ios/WKPasswordView.h; sourceTree = "<group>"; };
> 		A175C44921AA3170000037D0 /* ArgumentCodersCocoa.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ArgumentCodersCocoa.h; sourceTree = "<group>"; };
> 		A175C44B21AA331B000037D0 /* ArgumentCodersCocoa.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = ArgumentCodersCocoa.mm; sourceTree = "<group>"; };
>+		A181A79721ACAC610059A316 /* WebKitAdditions.mm */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitAdditions.mm; sourceTree = "<group>"; };
> 		A182D5B21BE6BD250087A7CC /* AccessibilityIOS.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AccessibilityIOS.mm; sourceTree = "<group>"; };
> 		A182D5B31BE6BD250087A7CC /* AccessibilityIOS.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AccessibilityIOS.h; sourceTree = "<group>"; };
> 		A19DD3BF1D07D16800AC823B /* _WKWebViewPrintFormatterInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _WKWebViewPrintFormatterInternal.h; sourceTree = "<group>"; };
>@@ -6358,6 +6360,7 @@
> 			isa = PBXGroup;
> 			children = (
> 				4450AEBF1DC3FAE5009943F2 /* SharedMemoryCocoa.cpp */,
>+				A181A79721ACAC610059A316 /* WebKitAdditions.mm */,
> 				A1FB68221F6E518200C43F9F /* WKCrashReporter.h */,
> 				A1FB68231F6E518200C43F9F /* WKCrashReporter.mm */,
> 			);
>@@ -9112,7 +9115,6 @@
> 				C0E3AA7C1209E83C00A49D01 /* Module.h in Headers */,
> 				2D50366B1BCDE17900E20BB3 /* NativeWebGestureEvent.h in Headers */,
> 				263172CF18B469490065B9C3 /* NativeWebTouchEvent.h in Headers */,
>-				637281A221ADC744009E0DE6 /* WKDownloadProgress.h in Headers */,
> 				1ADCB86B189831B30022EE5A /* NavigationActionData.h in Headers */,
> 				1ABC3DF61899E437004F0626 /* NavigationState.h in Headers */,
> 				1A6FBA2A11E6862700DB1371 /* NetscapeBrowserFuncs.h in Headers */,
>@@ -9672,6 +9674,7 @@
> 				293EBEAB1627D9C9005F89F1 /* WKDOMText.h in Headers */,
> 				BC017D2116263308007054F5 /* WKDOMTextIterator.h in Headers */,
> 				1AB7D78D1288CD9A00CFD08C /* WKDownload.h in Headers */,
>+				637281A221ADC744009E0DE6 /* WKDownloadProgress.h in Headers */,
> 				F409BA181E6E64BC009DA28E /* WKDragDestinationAction.h in Headers */,
> 				2DC18FAD218910490025A88D /* WKDrawingView.h in Headers */,
> 				1AF4592F19464B2000F9D4A2 /* WKError.h in Headers */,
>@@ -10792,7 +10795,6 @@
> 				2D92A794212B6AD400F493FD /* NPVariantData.cpp in Sources */,
> 				CDA29A281CBEB67A00901CCF /* PlaybackSessionManagerMessageReceiver.cpp in Sources */,
> 				CDA29A2A1CBEB67A00901CCF /* PlaybackSessionManagerProxyMessageReceiver.cpp in Sources */,
>-				637281A321ADC744009E0DE6 /* WKDownloadProgress.mm in Sources */,
> 				2D913449212CF9F000128AFD /* Plugin.cpp in Sources */,
> 				1A8EF4CC1252403700F7067F /* PluginControllerProxy.cpp in Sources */,
> 				1A2D91A61281D739001EB962 /* PluginControllerProxyMac.mm in Sources */,
>@@ -11039,6 +11041,7 @@
> 				2D92A78A212B6AB100F493FD /* WebKeyboardEvent.cpp in Sources */,
> 				1A6280F31919982A006AD9F9 /* WebKit.m in Sources */,
> 				2D92A78B212B6AB100F493FD /* WebKit2Initialize.cpp in Sources */,
>+				A181A79821ACC74B0059A316 /* WebKitAdditions.mm in Sources */,
> 				51F060E11654318500F3282F /* WebMDNSRegisterMessageReceiver.cpp in Sources */,
> 				2D92A78C212B6AB100F493FD /* WebMouseEvent.cpp in Sources */,
> 				31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */,
>@@ -11079,6 +11082,7 @@
> 				2D92A78F212B6AB100F493FD /* WebWheelEvent.cpp in Sources */,
> 				2D931169212F61B200044BFE /* WKContentView.mm in Sources */,
> 				2D93116A212F61B500044BFE /* WKContentViewInteraction.mm in Sources */,
>+				637281A321ADC744009E0DE6 /* WKDownloadProgress.mm in Sources */,
> 				5CA26D83217AD1B800F97A35 /* WKSafeBrowsingWarning.mm in Sources */,
> 				1DB01944211CF005009FB3E8 /* WKShareSheet.mm in Sources */,
> 				26F10BE919187E2E001D0E68 /* WKSyntheticClickTapGestureRecognizer.m in Sources */,
>diff --git a/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h b/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h
>index e4887cc88ab1f19fbda99f3c0b2c8aed1db3a044..dd72ee081800422e5df4404c196141c9d452488c 100644
>--- a/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h
>+++ b/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h
>@@ -96,6 +96,10 @@ private:
>     HashMap<uint64_t, WTF::Function<void (bool)>> m_pendingOpenPaymentSetupCallbacks;
> 
>     std::optional<AvailablePaymentNetworksSet> m_availablePaymentNetworks;
>+
>+#if USE(APPLE_INTERNAL_SDK)
>+#import <WebKitAdditions/WebPaymentCoordinatorAdditions.h>
>+#endif
> };
> 
> }

Actions: View | Formatted Diff | Diff

Attachments on bug 192131: 355960 | 355963 | 356070 | 356178