Diff
Modified: trunk/Source/WebCore/ChangeLog (238738 => 238739)
--- trunk/Source/WebCore/ChangeLog 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebCore/ChangeLog 2018-11-30 17:09:37 UTC (rev 238739)
@@ -1,3 +1,20 @@
+2018-11-30 Andy Estes <[email protected]>
+
+ [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-30 Xabier Rodriguez Calvar <[email protected]>
[GStreamer][EME] CDMInstance should be shipped as a GstContext to the decryptors
Modified: trunk/Source/WebCore/DerivedSources.make (238738 => 238739)
--- trunk/Source/WebCore/DerivedSources.make 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebCore/DerivedSources.make 2018-11-30 17:09:37 UTC (rev 238739)
@@ -1149,6 +1149,8 @@
ADDITIONAL_EVENT_NAMES =
ADDITIONAL_EVENT_TARGET_FACTORY =
+-include WebCoreDerivedSourcesAdditions.make
+
JS_BINDING_IDLS += $(ADDITIONAL_BINDING_IDLS)
all : $(ADDITIONAL_BINDING_IDLS:%.idl=JS%.h)
Modified: trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h (238738 => 238739)
--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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 @@
protected:
virtual ~PaymentCoordinatorClient() = default;
+
+#if defined(PAYMENTCOORDINATORCLIENT_ADDITIONS)
+PAYMENTCOORDINATORCLIENT_ADDITIONS
+#undef PAYMENTCOORDINATORCLIENT_ADDITIONS
+#endif
};
}
Modified: trunk/Source/WebCore/SourcesCocoa.txt (238738 => 238739)
--- trunk/Source/WebCore/SourcesCocoa.txt 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2018-11-30 17:09:37 UTC (rev 238739)
@@ -213,6 +213,7 @@
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
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (238738 => 238739)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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 */,
Modified: trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h (238738 => 238739)
--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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 <_javascript_Core/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 @@
macro(webkitIndexedDB) \
macro(webgpu) \
macro(window) \
- macro(writing)
+ macro(writing) \
+ WEBCORE_ADDITIONAL_PRIVATE_IDENTIFIERS(macro) \
class WebCoreBuiltinNames {
public:
Modified: trunk/Source/WebCore/page/SettingsBase.h (238738 => 238739)
--- trunk/Source/WebCore/page/SettingsBase.h 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebCore/page/SettingsBase.h 2018-11-30 17:09:37 UTC (rev 238739)
@@ -207,6 +207,10 @@
float m_multiLineTextMultiplierCoefficient { defaultMultiLineTextMultiplierCoefficient };
float m_maxTextAutosizingScaleIncrease { defaultMaxTextAutosizingScaleIncrease };
#endif
+
+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/SettingsAdditions.h>
+#endif
};
} // namespace WebCore
Added: trunk/Source/WebCore/platform/cocoa/WebCoreAdditions.mm (0 => 238739)
--- trunk/Source/WebCore/platform/cocoa/WebCoreAdditions.mm (rev 0)
+++ trunk/Source/WebCore/platform/cocoa/WebCoreAdditions.mm 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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
Modified: trunk/Source/WebKit/ChangeLog (238738 => 238739)
--- trunk/Source/WebKit/ChangeLog 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebKit/ChangeLog 2018-11-30 17:09:37 UTC (rev 238739)
@@ -1,3 +1,24 @@
+2018-11-30 Andy Estes <[email protected]>
+
+ [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-30 Frederic Wang <[email protected]>
[WebAuthN] Support CTAP HID authenticators on macOS
Modified: trunk/Source/WebKit/DerivedSources.make (238738 => 238739)
--- trunk/Source/WebKit/DerivedSources.make 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebKit/DerivedSources.make 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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 @@
# 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_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_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WebKit2)/Shared/WebPreferences.yaml
- $(RUBY) $< --input $(WebKit2)/Shared/WebPreferences.yaml
+$(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) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
+ $(RUBY) $< --input $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
Modified: trunk/Source/WebKit/Platform/IPC/MessageSender.h (238738 => 238739)
--- trunk/Source/WebKit/Platform/IPC/MessageSender.h 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebKit/Platform/IPC/MessageSender.h 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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 @@
}
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>);
Added: trunk/Source/WebKit/Platform/cocoa/WebKitAdditions.mm (0 => 238739)
--- trunk/Source/WebKit/Platform/cocoa/WebKitAdditions.mm (rev 0)
+++ trunk/Source/WebKit/Platform/cocoa/WebKitAdditions.mm 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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
Modified: trunk/Source/WebKit/SourcesCocoa.txt (238738 => 238739)
--- trunk/Source/WebKit/SourcesCocoa.txt 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2018-11-30 17:09:37 UTC (rev 238739)
@@ -62,6 +62,7 @@
Platform/cocoa/SharedMemoryCocoa.cpp
Platform/cocoa/WKCrashReporter.mm
+Platform/cocoa/WebKitAdditions.mm @no-unify
Platform/foundation/LoggingFoundation.mm
Modified: trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp (238738 => 238739)
--- trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2018-11-30 17:09:37 UTC (rev 238739)
@@ -44,6 +44,7 @@
, m_merchantValidationState(MerchantValidationState::Idle)
{
m_webPageProxy.process().addMessageReceiver(Messages::WebPaymentCoordinatorProxy::messageReceiverName(), m_webPageProxy.pageID(), *this);
+ finishConstruction(*this);
}
WebPaymentCoordinatorProxy::~WebPaymentCoordinatorProxy()
Modified: trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h (238738 => 238739)
--- trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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 @@
RetainPtr<NSWindow> m_sheetWindow;
RetainPtr<NSObject *> m_sheetWindowWillCloseObserver;
#endif
+
+#if defined(WEBPAYMENTCOORDINATORPROXY_ADDITIONS)
+WEBPAYMENTCOORDINATORPROXY_ADDITIONS
+#undef WEBPAYMENTCOORDINATORPROXY_ADDITIONS
+#else
+ void finishConstruction(WebPaymentCoordinatorProxy&) { }
+#endif
};
}
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (238738 => 238739)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-11-30 17:09:37 UTC (rev 238739)
@@ -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 */,
Modified: trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h (238738 => 238739)
--- trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h 2018-11-30 16:21:35 UTC (rev 238738)
+++ trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h 2018-11-30 17:09:37 UTC (rev 238739)
@@ -96,6 +96,10 @@
HashMap<uint64_t, WTF::Function<void (bool)>> m_pendingOpenPaymentSetupCallbacks;
std::optional<AvailablePaymentNetworksSet> m_availablePaymentNetworks;
+
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WebPaymentCoordinatorAdditions.h>
+#endif
};
}
