Diff
Modified: trunk/Source/WebCore/ChangeLog (195697 => 195698)
--- trunk/Source/WebCore/ChangeLog 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/ChangeLog 2016-01-27 23:12:31 UTC (rev 195698)
@@ -1,3 +1,35 @@
+2016-01-27 Anders Carlsson <[email protected]>
+
+ Add WebKitAdditions extension points to WebCore, WebKit and WebKitLegacy
+ https://bugs.webkit.org/show_bug.cgi?id=153550
+
+ Reviewed by Sam Weinig.
+
+ * DerivedSources.make:
+ Add the ability for WebKitAdditions to add events and event targets.
+
+ * WebCore.xcodeproj/project.pbxproj:
+ Add new files.
+
+ * bindings/scripts/InFilesCompiler.pm:
+ (initializeFromCommandLine):
+ (compile):
+ Handle multiple --input parameters.
+
+ * dom/EventNames.h:
+ Handle adding more event names.
+
+ * loader/EmptyClients.cpp:
+ (WebCore::fillWithEmptyClients):
+ * page/MainFrame.cpp:
+ (WebCore::MainFrame::MainFrame):
+ * page/MainFrame.h:
+ * page/PageConfiguration.h:
+ Add extension points.
+
+ * platform/cocoa/WebKitAdditions.mm: Added.
+ Import additions.
+
2016-01-27 Brady Eidson <[email protected]>
Modern IDB: Fix many Index tests.
Modified: trunk/Source/WebCore/DerivedSources.make (195697 => 195698)
--- trunk/Source/WebCore/DerivedSources.make 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/DerivedSources.make 2016-01-27 23:12:31 UTC (rev 195698)
@@ -763,6 +763,11 @@
endif
endif # IOS
+vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
+
+ADDITIONAL_EVENT_NAMES =
+ADDITIONAL_EVENT_TARGET_FACTORY =
+
-include WebCoreDerivedSourcesAdditions.make
NON_SVG_BINDING_IDLS += $(ADDITIONAL_BINDING_IDLS)
@@ -1118,15 +1123,19 @@
# Register event constructors and targets
+EVENT_NAMES = EventNames.in $(ADDITIONAL_EVENT_NAMES)
+
EventFactory.cpp EventHeaders.h EventInterfaces.h : EventFactory.intermediate
.INTERMEDIATE : EventFactory.intermediate
-EventFactory.intermediate : dom/make_event_factory.pl dom/EventNames.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventNames.in
+EventFactory.intermediate : dom/make_event_factory.pl $(EVENT_NAMES)
+ $(PERL) -I $(WebCore)/bindings/scripts $< $(addprefix --input , $(filter-out $(WebCore)/dom/make_event_factory.pl, $^))
+EVENT_TARGET_FACTORY = EventTargetFactory.in $(ADDITIONAL_EVENT_TARGET_FACTORY)
+
EventTargetHeaders.h EventTargetInterfaces.h : EventTargetFactory.intermediate
.INTERMEDIATE : EventTargetFactory.intermediate
-EventTargetFactory.intermediate : dom/make_event_factory.pl dom/EventTargetFactory.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventTargetFactory.in
+EventTargetFactory.intermediate : dom/make_event_factory.pl $(EVENT_TARGET_FACTORY)
+ $(PERL) -I $(WebCore)/bindings/scripts $< $(addprefix --input , $(filter-out $(WebCore)/dom/make_event_factory.pl, $^))
ExceptionCodeDescription.cpp ExceptionCodeDescription.h ExceptionHeaders.h ExceptionInterfaces.h : MakeDOMExceptions.intermediate
.INTERMEDIATE : MakeDOMExceptions.intermediate
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (195697 => 195698)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2016-01-27 23:12:31 UTC (rev 195698)
@@ -759,6 +759,7 @@
1A762C780A074F2600989F5B /* JSXPathNSResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A762C700A074F2600989F5B /* JSXPathNSResolver.h */; };
1A762C790A074F2600989F5B /* JSXPathResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A762C710A074F2600989F5B /* JSXPathResult.cpp */; };
1A762C7A0A074F2600989F5B /* JSXPathResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A762C720A074F2600989F5B /* JSXPathResult.h */; };
+ 1A7E19461C5863BE00CCDDF3 /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */; };
1A7E3C291710997300367935 /* ThreadableLoaderClientWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E3C281710997300367935 /* ThreadableLoaderClientWrapper.h */; };
1A7FA6190DDA3B3A0028F8A5 /* NetworkStateNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
1A7FA61B0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */; };
@@ -8113,6 +8114,7 @@
1A762C700A074F2600989F5B /* JSXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXPathNSResolver.h; sourceTree = "<group>"; };
1A762C710A074F2600989F5B /* JSXPathResult.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSXPathResult.cpp; sourceTree = "<group>"; };
1A762C720A074F2600989F5B /* JSXPathResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXPathResult.h; sourceTree = "<group>"; };
+ 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitAdditions.mm; sourceTree = "<group>"; };
1A7E3C281710997300367935 /* ThreadableLoaderClientWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableLoaderClientWrapper.h; sourceTree = "<group>"; };
1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkStateNotifier.h; sourceTree = "<group>"; };
1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkStateNotifier.cpp; sourceTree = "<group>"; };
@@ -19836,6 +19838,7 @@
46DB7D561B20FE3C005651B2 /* VNodeTrackerCocoa.cpp */,
CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
+ 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */,
52131E581C4F15220033F802 /* WebVideoFullscreenInterface.h */,
52D5A1A41C57488900DE34A3 /* WebVideoFullscreenModel.h */,
52D5A1A51C57488900DE34A3 /* WebVideoFullscreenModelVideoElement.h */,
@@ -29086,6 +29089,7 @@
2D29ECC7192ECC8300984B78 /* DisplayRefreshMonitorManager.cpp in Sources */,
CD52481A18E200ED0008A07D /* DisplaySleepDisabler.cpp in Sources */,
5D8C4DBF1428222C0026CE72 /* DisplaySleepDisablerCocoa.cpp in Sources */,
+ 1A7E19461C5863BE00CCDDF3 /* WebKitAdditions.mm in Sources */,
FD31609012B026F700C1A359 /* Distance.cpp in Sources */,
A1E1154413015C3D0054AC8C /* DistantLightSource.cpp in Sources */,
B2F34FE90E82F82700F627CD /* DNSCFNet.cpp in Sources */,
Modified: trunk/Source/WebCore/bindings/scripts/InFilesCompiler.pm (195697 => 195698)
--- trunk/Source/WebCore/bindings/scripts/InFilesCompiler.pm 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/bindings/scripts/InFilesCompiler.pm 2016-01-27 23:12:31 UTC (rev 195698)
@@ -37,7 +37,7 @@
package InFilesCompiler;
-my $inputFile = "";
+my @inputFiles;
my $outputDir = ".";
my $defaultItemFactory;
@@ -82,11 +82,11 @@
sub initializeFromCommandLine()
{
::GetOptions(
- 'input=s' => \$inputFile,
+ 'input=s' => \@inputFiles,
'outputDir=s' => \$outputDir,
);
- die "You must specify --input <file>" unless length($inputFile);
+ die "You must specify at least one --input <file>" unless scalar(@inputFiles);
::mkpath($outputDir);
@@ -99,15 +99,18 @@
my $object = shift;
my $generateCode = shift;
- my $file = new IO::File;
- open($file, $inputFile) or die "Failed to open file: $!";
-
my $InParser = InFilesParser->new();
- $InParser->parse($file, \¶meterHandler, \&itemHandler);
- close($file);
- die "Failed to read from file: $inputFile" if (keys %parsedItems == 0);
+ foreach my $inputFile (@inputFiles) {
+ my $file = new IO::File;
+ open($file, $inputFile) or die "Failed to open file: $!";
+ $InParser->parse($file, \¶meterHandler, \&itemHandler);
+
+ close($file);
+ die "Failed to read from file: $inputFile" if (keys %parsedItems == 0);
+ }
+
&$generateCode(\%parsedParameters, \%parsedItems);
}
Modified: trunk/Source/WebCore/dom/EventNames.h (195697 => 195698)
--- trunk/Source/WebCore/dom/EventNames.h 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/dom/EventNames.h 2016-01-27 23:12:31 UTC (rev 195698)
@@ -27,9 +27,18 @@
#include <functional>
#include <wtf/text/AtomicString.h>
+#if defined(__has_include) && __has_include(<WebKitAdditions/EventNamesAdditions.h>)
+#import <WebKitAdditions/EventNamesAdditions.h>
+#endif
+
namespace WebCore {
+#if !defined(ADDITIONAL_DOM_EVENT_NAMES_FOR_EACH)
+#define ADDITIONAL_DOM_EVENT_NAMES_FOR_EACH(macro)
+#endif
+
#define DOM_EVENT_NAMES_FOR_EACH(macro) \
+ ADDITIONAL_DOM_EVENT_NAMES_FOR_EACH(macro) \
macro(DOMActivate) \
macro(DOMCharacterDataModified) \
macro(DOMContentLoaded) \
Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (195697 => 195698)
--- trunk/Source/WebCore/loader/EmptyClients.cpp 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/loader/EmptyClients.cpp 2016-01-27 23:12:31 UTC (rev 195698)
@@ -44,6 +44,10 @@
#include "StorageNamespaceProvider.h"
#include <wtf/NeverDestroyed.h>
+#if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsIncludes.h>)
+#include <WebKitAdditions/EmptyClientsIncludes.h>
+#endif
+
namespace WebCore {
class EmptyDatabaseProvider final : public DatabaseProvider {
@@ -133,6 +137,10 @@
pageConfiguration.databaseProvider = adoptRef(new EmptyDatabaseProvider);
pageConfiguration.storageNamespaceProvider = adoptRef(new EmptyStorageNamespaceProvider);
pageConfiguration.visitedLinkStore = adoptRef(new EmptyVisitedLinkStore);
+
+#if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsFill.cpp>)
+#include <WebKitAdditions/EmptyClientsFill.cpp>
+#endif
}
class EmptyPopupMenu : public PopupMenu {
Modified: trunk/Source/WebCore/page/MainFrame.cpp (195697 => 195698)
--- trunk/Source/WebCore/page/MainFrame.cpp 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/page/MainFrame.cpp 2016-01-27 23:12:31 UTC (rev 195698)
@@ -39,6 +39,10 @@
#include "ServicesOverlayController.h"
#endif /* PLATFORM(MAC) */
+#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
+#include <WebKitAdditions/MainFrameIncludes.h>
+#endif
+
namespace WebCore {
inline MainFrame::MainFrame(Page& page, PageConfiguration& configuration)
@@ -53,6 +57,9 @@
, m_pageOverlayController(std::make_unique<PageOverlayController>(*this))
, m_diagnosticLoggingClient(configuration.diagnosticLoggingClient)
{
+#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameInitialization.cpp>)
+#include <WebKitAdditions/MainFrameInitialization.cpp>
+#endif
}
MainFrame::~MainFrame()
Modified: trunk/Source/WebCore/page/MainFrame.h (195697 => 195698)
--- trunk/Source/WebCore/page/MainFrame.h 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/page/MainFrame.h 2016-01-27 23:12:31 UTC (rev 195698)
@@ -29,6 +29,10 @@
#include "Frame.h"
#include <wtf/Vector.h>
+#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
+#include <WebKitAdditions/MainFrameIncludes.h>
+#endif
+
namespace WebCore {
class DiagnosticLoggingClient;
@@ -64,6 +68,10 @@
WEBCORE_EXPORT DiagnosticLoggingClient& diagnosticLoggingClient() const;
+#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameMembers.h>)
+#include <WebKitAdditions/MainFrameMembers.h>
+#endif
+
private:
MainFrame(Page&, PageConfiguration&);
Modified: trunk/Source/WebCore/page/PageConfiguration.h (195697 => 195698)
--- trunk/Source/WebCore/page/PageConfiguration.h 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebCore/page/PageConfiguration.h 2016-01-27 23:12:31 UTC (rev 195698)
@@ -29,6 +29,10 @@
#include <wtf/Noncopyable.h>
#include <wtf/RefPtr.h>
+#if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationIncludes.h>)
+#include <WebKitAdditions/PageConfigurationIncludes.h>
+#endif
+
namespace WebCore {
class AlternativeTextClient;
@@ -73,6 +77,10 @@
FrameLoaderClient* loaderClientForMainFrame { nullptr };
DiagnosticLoggingClient* diagnosticLoggingClient { nullptr };
+#if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationMembers.h>)
+#include <WebKitAdditions/PageConfigurationMembers.h>
+#endif
+
RefPtr<ApplicationCacheStorage> applicationCacheStorage;
RefPtr<DatabaseProvider> databaseProvider;
RefPtr<StorageNamespaceProvider> storageNamespaceProvider;
Added: trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm (0 => 195698)
--- trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm (rev 0)
+++ trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm 2016-01-27 23:12:31 UTC (rev 195698)
@@ -0,0 +1,31 @@
+/*
+ * 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.
+ */
+
+#include "config.h"
+
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreAdditions.cpp>)
+#include <WebKitAdditions/WebCoreAdditions.cpp>
+#endif
+
Modified: trunk/Source/WebKit/ChangeLog (195697 => 195698)
--- trunk/Source/WebKit/ChangeLog 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit/ChangeLog 2016-01-27 23:12:31 UTC (rev 195698)
@@ -1,3 +1,13 @@
+2016-01-27 Anders Carlsson <[email protected]>
+
+ Add WebKitAdditions extension points to WebCore, WebKit and WebKitLegacy
+ https://bugs.webkit.org/show_bug.cgi?id=153550
+
+ Reviewed by Sam Weinig.
+
+ * WebKit.xcodeproj/project.pbxproj:
+ Add new files.
+
2016-01-27 Alex Christensen <[email protected]>
[Win] Clean build fix after r195680.
Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (195697 => 195698)
--- trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj 2016-01-27 23:12:31 UTC (rev 195698)
@@ -54,6 +54,7 @@
1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
1A77B02F0EE7730500C8A1F9 /* WebPluginRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */; };
+ 1A781ACB1C56FF7C00FB96DD /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */; };
1A86CCD41AD48A620074BA89 /* WebApplicationCacheInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */; };
1A8DED500EE88B8A00F25022 /* HostedNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */; };
1A8DED510EE88B8A00F25022 /* HostedNetscapePluginStream.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */; };
@@ -512,6 +513,7 @@
1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginRequest.m; sourceTree = "<group>"; };
+ 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebKitAdditions.mm; path = mac/WebKitAdditions.mm; sourceTree = "<group>"; };
1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheInternal.h; sourceTree = "<group>"; };
1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HostedNetscapePluginStream.h; sourceTree = "<group>"; };
1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HostedNetscapePluginStream.mm; sourceTree = "<group>"; };
@@ -965,6 +967,7 @@
F5F732D202FF4D4F01A80180 /* WebKit.exp */,
319A3F4D1885E5FB00E0C900 /* WebKit.mac.exp */,
A10C1D8F1820307D0036883A /* WebKit.iOS.exp */,
+ 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */,
F5C283730284676D018635CA /* WebKitPrefix.h */,
A182B74E199E7B8F001FD95A /* migrate-headers.sh */,
A182B74F199E7B8F001FD95A /* postprocess-headers.sh */,
@@ -1897,7 +1900,6 @@
A10C1D3C18202FC50036883A /* WebNSStringExtrasIPhone.h in Headers */,
9398107E0824BF01008DF038 /* WebNSURLExtras.h in Headers */,
65E0F88408500917007E5CB9 /* WebNSURLRequestExtras.h in Headers */,
- E4AEF97C1C0DF4BC00B01727 /* WebResourceLoadScheduler.h in Headers */,
65E0F9E608500F23007E5CB9 /* WebNSUserDefaultsExtras.h in Headers */,
939810240824BF01008DF038 /* WebNSViewExtras.h in Headers */,
939810250824BF01008DF038 /* WebNSWindowExtras.h in Headers */,
@@ -1933,6 +1935,7 @@
934C4AA00F0141F7009372C0 /* WebResourceInternal.h in Headers */,
939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */,
656D333E0AF21AE900212169 /* WebResourceLoadDelegatePrivate.h in Headers */,
+ E4AEF97C1C0DF4BC00B01727 /* WebResourceLoadScheduler.h in Headers */,
939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */,
7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */,
C0167BF80D7F5DD00028696E /* WebScriptDebugger.h in Headers */,
@@ -2246,7 +2249,6 @@
BC7F889F10C9D30C00D6133D /* WebGeolocationPosition.mm in Sources */,
A10C1D3718202FC50036883A /* WebGeolocationProviderIOS.mm in Sources */,
939811130824BF01008DF038 /* WebHistory.mm in Sources */,
- E4AEF97B1C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp in Sources */,
939810BD0824BF01008DF038 /* WebHistoryItem.mm in Sources */,
1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */,
939810F30824BF01008DF038 /* WebHTMLRepresentation.mm in Sources */,
@@ -2264,6 +2266,7 @@
37D1DCA91065928C0068F7EF /* WebJSPDFDoc.mm in Sources */,
939811170824BF01008DF038 /* WebKeyGenerator.mm in Sources */,
939811030824BF01008DF038 /* WebKitErrors.m in Sources */,
+ 1A781ACB1C56FF7C00FB96DD /* WebKitAdditions.mm in Sources */,
CD8BFCE715531224005AFB25 /* WebKitFullScreenListener.mm in Sources */,
939810C30824BF01008DF038 /* WebKitLogging.m in Sources */,
939810C40824BF01008DF038 /* WebKitNSStringExtras.mm in Sources */,
@@ -2324,6 +2327,7 @@
939810F80824BF01008DF038 /* WebPreferences.mm in Sources */,
1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */,
9398111A0824BF01008DF038 /* WebResource.mm in Sources */,
+ E4AEF97B1C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp in Sources */,
7E6FEF0908985A7200C44C3F /* WebScriptDebugDelegate.mm in Sources */,
C0167BF90D7F5DD00028696E /* WebScriptDebugger.mm in Sources */,
C0B1F7E910AC8E3100C925D9 /* WebScriptWorld.mm in Sources */,
Modified: trunk/Source/WebKit/mac/ChangeLog (195697 => 195698)
--- trunk/Source/WebKit/mac/ChangeLog 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit/mac/ChangeLog 2016-01-27 23:12:31 UTC (rev 195698)
@@ -1,3 +1,21 @@
+2016-01-27 Anders Carlsson <[email protected]>
+
+ Add WebKitAdditions extension points to WebCore, WebKit and WebKitLegacy
+ https://bugs.webkit.org/show_bug.cgi?id=153550
+
+ Reviewed by Sam Weinig.
+
+ * Configurations/WebKitLegacy.xcconfig:
+ Add WKA header search paths.
+
+ * WebKitAdditions.mm: Added.
+ Add addition files.
+
+ * WebView/WebView.mm:
+ (-[WebView _commonInitializationWithFrameName:groupName:]):
+ (-[WebView initSimpleHTMLDocumentWithStyle:frame:preferences:groupName:]):
+ Add extension points.
+
2016-01-27 Chris Dumez <[email protected]>
window.atob() should ignore spaces in input
Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (195697 => 195698)
--- trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig 2016-01-27 23:12:31 UTC (rev 195698)
@@ -48,7 +48,9 @@
GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy $(inherited);
-HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(HEADER_SEARCH_PATHS);
+
+WEBKITADDITIONS_HEADER_SEARCH_PATHS = $(BUILT_PRODUCTS_DIR)/usr/local/include/WebKitAdditions $(SDKROOT)/usr/local/include/WebKitAdditions;
+HEADER_SEARCH_PATHS = $(WEBKITSYSTEMINTERFACE_STATIC_LIBRARY_HEADERS_FOLDER_PATH) "$(WEBCORE_PRIVATE_HEADERS_DIR)/ForwardingHeaders" "$(WEBCORE_PRIVATE_HEADERS_DIR)/icu" "$(BUILT_PRODUCTS_DIR)/DerivedSources/WebKitLegacy" "$(BUILT_PRODUCTS_DIR)/usr/local/include" $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) $(HEADER_SEARCH_PATHS);
INFOPLIST_FILE = mac/Info.plist;
INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
Added: trunk/Source/WebKit/mac/WebKitAdditions.mm (0 => 195698)
--- trunk/Source/WebKit/mac/WebKitAdditions.mm (rev 0)
+++ trunk/Source/WebKit/mac/WebKitAdditions.mm 2016-01-27 23:12:31 UTC (rev 195698)
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+#ifdef __has_include
+#if __has_include(<WebKitAdditions/WebKitLegacyAdditions.cpp>)
+#include <WebKitAdditions/WebKitLegacyAdditions.cpp>
+#endif
+#endif
Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (195697 => 195698)
--- trunk/Source/WebKit/mac/WebView/WebView.mm 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit/mac/WebView/WebView.mm 2016-01-27 23:12:31 UTC (rev 195698)
@@ -295,6 +295,10 @@
#import <WebCore/WebMediaSessionManagerMac.h>
#endif
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewIncludes.h>)
+#import <WebKitAdditions/WebViewIncludes.h>
+#endif
+
#if PLATFORM(MAC)
SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
#endif
@@ -968,6 +972,11 @@
pageConfiguration.chromeClient = new WebChromeClientIOS(self);
pageConfiguration.inspectorClient = new WebInspectorClient(self);
#endif
+
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
+#import <WebKitAdditions/WebViewInitialization.mm>
+#endif
+
pageConfiguration.editorClient = new WebEditorClient(self);
pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
@@ -1207,6 +1216,11 @@
#if ENABLE(DRAG_SUPPORT)
pageConfiguration.dragClient = new WebDragClient(self);
#endif
+
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
+#import <WebKitAdditions/WebViewInitialization.mm>
+#endif
+
pageConfiguration.editorClient = new WebEditorClient(self);
pageConfiguration.inspectorClient = new WebInspectorClient(self);
pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
Modified: trunk/Source/WebKit2/ChangeLog (195697 => 195698)
--- trunk/Source/WebKit2/ChangeLog 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit2/ChangeLog 2016-01-27 23:12:31 UTC (rev 195698)
@@ -1,3 +1,34 @@
+2016-01-27 Anders Carlsson <[email protected]>
+
+ Add WebKitAdditions extension points to WebCore, WebKit and WebKitLegacy
+ https://bugs.webkit.org/show_bug.cgi?id=153550
+
+ Reviewed by Sam Weinig.
+
+ * DerivedSources.make:
+ Add the ability for WebKitAdditions to add new message receivers.
+
+ * Shared/Cocoa/WebKitAdditions.mm: Added.
+ Add addition files.
+
+ * Shared/WebCoreArgumentCoders.h:
+ Add extension points.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::reattachToWebProcess):
+ (WebKit::WebPageProxy::resetState):
+ Add extension points.
+
+ * UIProcess/WebPageProxy.h:
+ Add extension points.
+
+ * WebKit2.xcodeproj/project.pbxproj:
+ Add new files.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ Add extension points.
+
2016-01-27 Chris Dumez <[email protected]>
window.atob() should ignore spaces in input
Modified: trunk/Source/WebKit2/DerivedSources.make (195697 => 195698)
--- trunk/Source/WebKit2/DerivedSources.make 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit2/DerivedSources.make 2016-01-27 23:12:31 UTC (rev 195698)
@@ -67,6 +67,7 @@
$(WebKit2)/UIProcess/UserContent \
$(WebKit2)/UIProcess/mac \
$(WebKit2)/UIProcess/ios \
+ $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) \
#
MESSAGE_RECEIVERS = \
Added: trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm (0 => 195698)
--- trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm (rev 0)
+++ trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm 2016-01-27 23:12:31 UTC (rev 195698)
@@ -0,0 +1,30 @@
+/*
+ * 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.
+ */
+
+#import "config.h"
+
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebKitAdditions.mm>)
+#import <WebKitAdditions/WebKitAdditions.mm>
+#endif
Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (195697 => 195698)
--- trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h 2016-01-27 23:12:31 UTC (rev 195698)
@@ -465,4 +465,8 @@
} // namespace IPC
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreArgumentCodersAdditions.h>)
+#include <WebKitAdditions/WebCoreArgumentCodersAdditions.h>
+#endif
+
#endif // WebCoreArgumentCoders_h
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (195697 => 195698)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-01-27 23:12:31 UTC (rev 195698)
@@ -168,6 +168,10 @@
#include <WebCore/MediaSessionMetadata.h>
#endif
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
+#include <WebKitAdditions/WebPageProxyIncludes.h>
+#endif
+
// This controls what strategy we use for mouse wheel coalescing.
#define MERGE_WHEEL_EVENTS 1
@@ -473,6 +477,10 @@
m_vibration = WebVibrationProxy::create(this);
#endif
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.h>)
+#include <WebKitAdditions/WebPageProxyInitialization.h>
+#endif
+
m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, *this);
if (m_sessionID.isEphemeral())
@@ -701,6 +709,10 @@
m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
#endif
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.h>)
+#include <WebKitAdditions/WebPageProxyInitialization.h>
+#endif
+
initializeWebPage();
m_pageClient.didRelaunchProcess();
@@ -5032,6 +5044,10 @@
m_pageClient.mediaSessionManager().removeAllPlaybackTargetPickerClients(*this);
#endif
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInvalidation.h>)
+#include <WebKitAdditions/WebPageProxyInvalidation.h>
+#endif
+
CallbackBase::Error error;
switch (resetStateReason) {
case ResetStateReason::PageInvalidated:
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (195697 => 195698)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-01-27 23:12:31 UTC (rev 195698)
@@ -122,6 +122,10 @@
#include <WebCore/WebMediaSessionManagerClient.h>
#endif
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
+#include <WebKitAdditions/WebPageProxyIncludes.h>
+#endif
+
#if ENABLE(MEDIA_SESSION)
namespace WebCore {
class MediaSessionMetadata;
@@ -1539,6 +1543,10 @@
RefPtr<WebVibrationProxy> m_vibration;
#endif
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyMembers.h>)
+#include <WebKitAdditions/WebPageProxyMembers.h>
+#endif
+
CallbackMap m_callbacks;
HashSet<uint64_t> m_loadDependentStringCallbackIDs;
Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (195697 => 195698)
--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2016-01-27 23:12:31 UTC (rev 195698)
@@ -308,6 +308,7 @@
1A6FBD2811E69BC200DB1371 /* NetscapePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FBD2611E69BC200DB1371 /* NetscapePlugin.h */; };
1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */; };
1A7284481959F8040007BCE5 /* SessionStateConversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7284441959ED100007BCE5 /* SessionStateConversion.cpp */; };
+ 1A781AE71C5714DA00FB96DD /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A781AE51C5714DA00FB96DD /* WebKitAdditions.mm */; };
1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */; };
1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */; };
1A7C0DF61B7D1F1000A9B848 /* WKWindowFeaturesRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7C0DF41B7D1F1000A9B848 /* WKWindowFeaturesRef.cpp */; };
@@ -2416,6 +2417,7 @@
1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePlugin.cpp; sourceTree = "<group>"; };
1A7284441959ED100007BCE5 /* SessionStateConversion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionStateConversion.cpp; sourceTree = "<group>"; };
1A7284451959ED100007BCE5 /* SessionStateConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionStateConversion.h; sourceTree = "<group>"; };
+ 1A781AE51C5714DA00FB96DD /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitAdditions.mm; sourceTree = "<group>"; };
1A7865B616CAC6FD00ACE83A /* PluginProcessConnectionManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = PluginProcessConnectionManager.messages.in; sourceTree = "<group>"; };
1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessConnectionManagerMessageReceiver.cpp; sourceTree = "<group>"; };
1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessConnectionManagerMessages.h; sourceTree = "<group>"; };
@@ -5416,6 +5418,7 @@
378E1A3B181ED6FF0031007A /* APIObject.mm */,
37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */,
37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */,
+ 1A781AE51C5714DA00FB96DD /* WebKitAdditions.mm */,
37C4C0921814B3AF003688B9 /* WKNSArray.h */,
37C4C0911814B3AF003688B9 /* WKNSArray.mm */,
373CEAD4185417AE008C363D /* WKNSData.h */,
@@ -9562,6 +9565,7 @@
516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */,
513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
+ 1A781AE71C5714DA00FB96DD /* WebKitAdditions.mm in Sources */,
51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */,
Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (195697 => 195698)
--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-01-27 23:03:28 UTC (rev 195697)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-01-27 23:12:31 UTC (rev 195698)
@@ -227,6 +227,10 @@
#include <WebCore/MediaPlayerRequestInstallMissingPluginsCallback.h>
#endif
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageIncludes.h>)
+#include <WebKitAdditions/WebPageIncludes.h>
+#endif
+
using namespace JSC;
using namespace WebCore;
@@ -379,6 +383,7 @@
#if USE(AUTOCORRECTION_PANEL)
pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(this);
#endif
+
pageConfiguration.plugInClient = new WebPlugInClient(*this);
pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(*this);
@@ -389,6 +394,10 @@
pageConfiguration.userContentController = m_userContentController ? &m_userContentController->userContentController() : &m_pageGroup->userContentController();
pageConfiguration.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageInitialization.h>)
+#include <WebKitAdditions/WebPageInitialization.h>
+#endif
+
m_page = std::make_unique<Page>(pageConfiguration);
m_drawingArea = DrawingArea::create(*this, parameters);
