Diff
Modified: trunk/Source/WebCore/ChangeLog (238721 => 238722)
--- trunk/Source/WebCore/ChangeLog 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebCore/ChangeLog 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1,5 +1,17 @@
2018-11-29 Ryan Haddad <[email protected]>
+ Unreviewed, rolling out r238713.
+
+ Breaks internal builds.
+
+ Reverted changeset:
+
+ "[Cocoa] Add some WKA extension points"
+ https://bugs.webkit.org/show_bug.cgi?id=192131
+ https://trac.webkit.org/changeset/238713
+
+2018-11-29 Ryan Haddad <[email protected]>
+
Unreviewed, rolling out r238680.
Caused existing webrtc layout tests to fail an assertion.
Modified: trunk/Source/WebCore/DerivedSources.make (238721 => 238722)
--- trunk/Source/WebCore/DerivedSources.make 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebCore/DerivedSources.make 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1149,8 +1149,6 @@
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 (238721 => 238722)
--- trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebCore/Modules/applepay/PaymentCoordinatorClient.h 2018-11-30 01:50:22 UTC (rev 238722)
@@ -31,10 +31,6 @@
#include <wtf/Forward.h>
#include <wtf/Function.h>
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/PaymentCoordinatorClientAdditions.h>
-#endif
-
namespace WebCore {
class PaymentMerchantSession;
@@ -66,11 +62,6 @@
protected:
virtual ~PaymentCoordinatorClient() = default;
-
-#if defined(PAYMENTCOORDINATORCLIENT_ADDITIONS)
-PAYMENTCOORDINATORCLIENT_ADDITIONS
-#undef PAYMENTCOORDINATORCLIENT_ADDITIONS
-#endif
};
}
Modified: trunk/Source/WebCore/SourcesCocoa.txt (238721 => 238722)
--- trunk/Source/WebCore/SourcesCocoa.txt 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebCore/SourcesCocoa.txt 2018-11-30 01:50:22 UTC (rev 238722)
@@ -213,7 +213,6 @@
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 (238721 => 238722)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2018-11-30 01:50:22 UTC (rev 238722)
@@ -2992,7 +2992,6 @@
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 */; };
@@ -11132,7 +11131,6 @@
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>"; };
@@ -22145,7 +22143,6 @@
52D5A1A61C57488900DE34A3 /* VideoFullscreenModelVideoElement.mm */,
CDC939A51E9BDFB100BB768D /* VideoToolboxSoftLink.cpp */,
CDC939A61E9BDFB100BB768D /* VideoToolboxSoftLink.h */,
- A17E4F26219BC01600E1C7EE /* WebCoreAdditions.mm */,
CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
5DFEBAB618592B6D00C75BEB /* WebKitAvailability.h */,
@@ -32931,7 +32928,6 @@
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 (238721 => 238722)
--- trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebCore/bindings/js/WebCoreBuiltinNames.h 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1,6 +1,5 @@
/*
* 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
@@ -29,16 +28,8 @@
#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) \
@@ -350,8 +341,7 @@
macro(webkitIndexedDB) \
macro(webgpu) \
macro(window) \
- macro(writing) \
- WEBCORE_ADDITIONAL_PRIVATE_IDENTIFIERS(macro) \
+ macro(writing)
class WebCoreBuiltinNames {
public:
Modified: trunk/Source/WebCore/page/SettingsBase.h (238721 => 238722)
--- trunk/Source/WebCore/page/SettingsBase.h 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebCore/page/SettingsBase.h 2018-11-30 01:50:22 UTC (rev 238722)
@@ -207,10 +207,6 @@
float m_multiLineTextMultiplierCoefficient { defaultMultiLineTextMultiplierCoefficient };
float m_maxTextAutosizingScaleIncrease { defaultMaxTextAutosizingScaleIncrease };
#endif
-
-#if USE(APPLE_INTERNAL_SDK)
-#include <WebKitAdditions/SettingsAdditions.h>
-#endif
};
} // namespace WebCore
Deleted: trunk/Source/WebCore/platform/cocoa/WebCoreAdditions.mm (238721 => 238722)
--- trunk/Source/WebCore/platform/cocoa/WebCoreAdditions.mm 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebCore/platform/cocoa/WebCoreAdditions.mm 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1,30 +0,0 @@
-/*
- * 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 (238721 => 238722)
--- trunk/Source/WebKit/ChangeLog 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/ChangeLog 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1,3 +1,15 @@
+2018-11-29 Ryan Haddad <[email protected]>
+
+ Unreviewed, rolling out r238713.
+
+ Breaks internal builds.
+
+ Reverted changeset:
+
+ "[Cocoa] Add some WKA extension points"
+ https://bugs.webkit.org/show_bug.cgi?id=192131
+ https://trac.webkit.org/changeset/238713
+
2018-11-29 Simon Fraser <[email protected]>
Add an internal feature flag to enable async overflow scrolling
Modified: trunk/Source/WebKit/DerivedSources.make (238721 => 238722)
--- trunk/Source/WebKit/DerivedSources.make 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/DerivedSources.make 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1,4 +1,4 @@
-# Copyright (C) 2010-2018 Apple Inc. All rights reserved.
+# Copyright (C) 2010-2017 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,12 +290,6 @@
# 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 \
@@ -308,10 +302,7 @@
WEB_PREFERENCES_FILES = $(basename $(notdir $(WEB_PREFERENCES_TEMPLATES)))
WEB_PREFERENCES_PATTERNS = $(subst .,%,$(WEB_PREFERENCES_FILES))
-all : $(WEB_PREFERENCES_FILES) $(WEB_PREFERENCES_COMBINED_INPUT_FILE)
+all : $(WEB_PREFERENCES_FILES)
-$(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)
+$(WEB_PREFERENCES_PATTERNS) : $(WebKit2)/Scripts/GeneratePreferences.rb $(WEB_PREFERENCES_TEMPLATES) $(WebKit2)/Shared/WebPreferences.yaml
+ $(RUBY) $< --input $(WebKit2)/Shared/WebPreferences.yaml
Modified: trunk/Source/WebKit/Platform/IPC/MessageSender.h (238721 => 238722)
--- trunk/Source/WebKit/Platform/IPC/MessageSender.h 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/Platform/IPC/MessageSender.h 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2010-2018 Apple Inc. All rights reserved.
+ * Copyright (C) 2010-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
@@ -66,9 +66,11 @@
}
template<typename T, typename... Args>
- void sendWithAsyncReply(T&& message, CompletionHandler<void(Args...)>&& completionHandler)
+ void sendWithAsyncReply(T&& message, CompletionHandler<void(Args...)>&& args, uint64_t destinationID = 0)
{
- messageSenderConnection()->sendWithAsyncReply(WTFMove(message), WTFMove(completionHandler), messageSenderDestinationID());
+ ASSERT(messageSenderConnection());
+
+ messageSenderConnection()->sendWithAsyncReply(WTFMove(message), WTFMove(args), destinationID);
}
virtual bool sendMessage(std::unique_ptr<Encoder>, OptionSet<SendOption>);
Deleted: trunk/Source/WebKit/Platform/cocoa/WebKitAdditions.mm (238721 => 238722)
--- trunk/Source/WebKit/Platform/cocoa/WebKitAdditions.mm 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/Platform/cocoa/WebKitAdditions.mm 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1,30 +0,0 @@
-/*
- * 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 (238721 => 238722)
--- trunk/Source/WebKit/SourcesCocoa.txt 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/SourcesCocoa.txt 2018-11-30 01:50:22 UTC (rev 238722)
@@ -62,7 +62,6 @@
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 (238721 => 238722)
--- trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.cpp 2018-11-30 01:50:22 UTC (rev 238722)
@@ -44,7 +44,6 @@
, 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 (238721 => 238722)
--- trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/UIProcess/ApplePay/WebPaymentCoordinatorProxy.h 2018-11-30 01:50:22 UTC (rev 238722)
@@ -33,10 +33,6 @@
#include <wtf/RetainPtr.h>
#include <wtf/WeakPtr.h>
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebPaymentCoordinatorProxyAdditions.h>
-#endif
-
namespace IPC {
class DataReference;
}
@@ -154,13 +150,6 @@
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 (238721 => 238722)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2018-11-30 01:50:22 UTC (rev 238722)
@@ -1270,7 +1270,6 @@
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, ); }; };
@@ -3837,7 +3836,6 @@
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>"; };
@@ -6360,7 +6358,6 @@
isa = PBXGroup;
children = (
4450AEBF1DC3FAE5009943F2 /* SharedMemoryCocoa.cpp */,
- A181A79721ACAC610059A316 /* WebKitAdditions.mm */,
A1FB68221F6E518200C43F9F /* WKCrashReporter.h */,
A1FB68231F6E518200C43F9F /* WKCrashReporter.mm */,
);
@@ -11042,7 +11039,6 @@
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 */,
Modified: trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h (238721 => 238722)
--- trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h 2018-11-30 01:45:49 UTC (rev 238721)
+++ trunk/Source/WebKit/WebProcess/ApplePay/WebPaymentCoordinator.h 2018-11-30 01:50:22 UTC (rev 238722)
@@ -96,10 +96,6 @@
HashMap<uint64_t, WTF::Function<void (bool)>> m_pendingOpenPaymentSetupCallbacks;
std::optional<AvailablePaymentNetworksSet> m_availablePaymentNetworks;
-
-#if USE(APPLE_INTERNAL_SDK)
-#import <WebKitAdditions/WebPaymentCoordinatorAdditions.h>
-#endif
};
}
