<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[195698] trunk/Source</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/195698">195698</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-01-27 15:12:31 -0800 (Wed, 27 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add WebKitAdditions extension points to WebCore, WebKit and WebKitLegacy
https://bugs.webkit.org/show_bug.cgi?id=153550
Reviewed by Sam Weinig.
Source/WebCore:
* 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.
Source/WebKit:
* WebKit.xcodeproj/project.pbxproj:
Add new files.
Source/WebKit/mac:
* 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.
Source/WebKit2:
* 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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreDerivedSourcesmake">trunk/Source/WebCore/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebCoreWebCorexcodeprojprojectpbxproj">trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebCorebindingsscriptsInFilesCompilerpm">trunk/Source/WebCore/bindings/scripts/InFilesCompiler.pm</a></li>
<li><a href="#trunkSourceWebCoredomEventNamesh">trunk/Source/WebCore/dom/EventNames.h</a></li>
<li><a href="#trunkSourceWebCoreloaderEmptyClientscpp">trunk/Source/WebCore/loader/EmptyClients.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMainFramecpp">trunk/Source/WebCore/page/MainFrame.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMainFrameh">trunk/Source/WebCore/page/MainFrame.h</a></li>
<li><a href="#trunkSourceWebCorepagePageConfigurationh">trunk/Source/WebCore/page/PageConfiguration.h</a></li>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitWebKitxcodeprojprojectpbxproj">trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig">trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewmm">trunk/Source/WebKit/mac/WebView/WebView.mm</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2DerivedSourcesmake">trunk/Source/WebKit2/DerivedSources.make</a></li>
<li><a href="#trunkSourceWebKit2SharedWebCoreArgumentCodersh">trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreplatformcocoaWebKitAdditionsmm">trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebKitAdditionsmm">trunk/Source/WebKit/mac/WebKitAdditions.mm</a></li>
<li><a href="#trunkSourceWebKit2SharedCocoaWebKitAdditionsmm">trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-01-27 Anders Carlsson <andersca@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-01-27 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Fix many Index tests.
</span></span></pre></div>
<a id="trunkSourceWebCoreDerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/DerivedSources.make (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -763,6 +763,11 @@
</span><span class="cx"> endif
</span><span class="cx"> endif # IOS
</span><span class="cx">
</span><ins>+vpath %.in $(WEBKITADDITIONS_HEADER_SEARCH_PATHS)
+
+ADDITIONAL_EVENT_NAMES =
+ADDITIONAL_EVENT_TARGET_FACTORY =
+
</ins><span class="cx"> -include WebCoreDerivedSourcesAdditions.make
</span><span class="cx">
</span><span class="cx"> NON_SVG_BINDING_IDLS += $(ADDITIONAL_BINDING_IDLS)
</span><span class="lines">@@ -1118,15 +1123,19 @@
</span><span class="cx">
</span><span class="cx"> # Register event constructors and targets
</span><span class="cx">
</span><ins>+EVENT_NAMES = EventNames.in $(ADDITIONAL_EVENT_NAMES)
+
</ins><span class="cx"> EventFactory.cpp EventHeaders.h EventInterfaces.h : EventFactory.intermediate
</span><span class="cx"> .INTERMEDIATE : EventFactory.intermediate
</span><del>-EventFactory.intermediate : dom/make_event_factory.pl dom/EventNames.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventNames.in
</del><ins>+EventFactory.intermediate : dom/make_event_factory.pl $(EVENT_NAMES)
+ $(PERL) -I $(WebCore)/bindings/scripts $< $(addprefix --input , $(filter-out $(WebCore)/dom/make_event_factory.pl, $^))
</ins><span class="cx">
</span><ins>+EVENT_TARGET_FACTORY = EventTargetFactory.in $(ADDITIONAL_EVENT_TARGET_FACTORY)
+
</ins><span class="cx"> EventTargetHeaders.h EventTargetInterfaces.h : EventTargetFactory.intermediate
</span><span class="cx"> .INTERMEDIATE : EventTargetFactory.intermediate
</span><del>-EventTargetFactory.intermediate : dom/make_event_factory.pl dom/EventTargetFactory.in
- $(PERL) -I $(WebCore)/bindings/scripts $< --input $(WebCore)/dom/EventTargetFactory.in
</del><ins>+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, $^))
</ins><span class="cx">
</span><span class="cx"> ExceptionCodeDescription.cpp ExceptionCodeDescription.h ExceptionHeaders.h ExceptionInterfaces.h : MakeDOMExceptions.intermediate
</span><span class="cx"> .INTERMEDIATE : MakeDOMExceptions.intermediate
</span></span></pre></div>
<a id="trunkSourceWebCoreWebCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -759,6 +759,7 @@
</span><span class="cx"> 1A762C780A074F2600989F5B /* JSXPathNSResolver.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A762C700A074F2600989F5B /* JSXPathNSResolver.h */; };
</span><span class="cx"> 1A762C790A074F2600989F5B /* JSXPathResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A762C710A074F2600989F5B /* JSXPathResult.cpp */; };
</span><span class="cx"> 1A762C7A0A074F2600989F5B /* JSXPathResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A762C720A074F2600989F5B /* JSXPathResult.h */; };
</span><ins>+ 1A7E19461C5863BE00CCDDF3 /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */; };
</ins><span class="cx"> 1A7E3C291710997300367935 /* ThreadableLoaderClientWrapper.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7E3C281710997300367935 /* ThreadableLoaderClientWrapper.h */; };
</span><span class="cx"> 1A7FA6190DDA3B3A0028F8A5 /* NetworkStateNotifier.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 1A7FA61B0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */; };
</span><span class="lines">@@ -8113,6 +8114,7 @@
</span><span class="cx"> 1A762C700A074F2600989F5B /* JSXPathNSResolver.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXPathNSResolver.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A762C710A074F2600989F5B /* JSXPathResult.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = JSXPathResult.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A762C720A074F2600989F5B /* JSXPathResult.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = JSXPathResult.h; sourceTree = "<group>"; };
</span><ins>+ 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitAdditions.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1A7E3C281710997300367935 /* ThreadableLoaderClientWrapper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadableLoaderClientWrapper.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A7FA6180DDA3B3A0028F8A5 /* NetworkStateNotifier.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NetworkStateNotifier.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A7FA61A0DDA3BBE0028F8A5 /* NetworkStateNotifier.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetworkStateNotifier.cpp; sourceTree = "<group>"; };
</span><span class="lines">@@ -19836,6 +19838,7 @@
</span><span class="cx"> 46DB7D561B20FE3C005651B2 /* VNodeTrackerCocoa.cpp */,
</span><span class="cx"> CDC979F31C498C0900DB50D4 /* WebCoreNSErrorExtras.h */,
</span><span class="cx"> CDC979F21C498C0900DB50D4 /* WebCoreNSErrorExtras.mm */,
</span><ins>+ 1A7E19441C5863BE00CCDDF3 /* WebKitAdditions.mm */,
</ins><span class="cx"> 52131E581C4F15220033F802 /* WebVideoFullscreenInterface.h */,
</span><span class="cx"> 52D5A1A41C57488900DE34A3 /* WebVideoFullscreenModel.h */,
</span><span class="cx"> 52D5A1A51C57488900DE34A3 /* WebVideoFullscreenModelVideoElement.h */,
</span><span class="lines">@@ -29086,6 +29089,7 @@
</span><span class="cx"> 2D29ECC7192ECC8300984B78 /* DisplayRefreshMonitorManager.cpp in Sources */,
</span><span class="cx"> CD52481A18E200ED0008A07D /* DisplaySleepDisabler.cpp in Sources */,
</span><span class="cx"> 5D8C4DBF1428222C0026CE72 /* DisplaySleepDisablerCocoa.cpp in Sources */,
</span><ins>+ 1A7E19461C5863BE00CCDDF3 /* WebKitAdditions.mm in Sources */,
</ins><span class="cx"> FD31609012B026F700C1A359 /* Distance.cpp in Sources */,
</span><span class="cx"> A1E1154413015C3D0054AC8C /* DistantLightSource.cpp in Sources */,
</span><span class="cx"> B2F34FE90E82F82700F627CD /* DNSCFNet.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsscriptsInFilesCompilerpm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/scripts/InFilesCompiler.pm (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> package InFilesCompiler;
</span><span class="cx">
</span><del>-my $inputFile = "";
</del><ins>+my @inputFiles;
</ins><span class="cx"> my $outputDir = ".";
</span><span class="cx"> my $defaultItemFactory;
</span><span class="cx">
</span><span class="lines">@@ -82,11 +82,11 @@
</span><span class="cx"> sub initializeFromCommandLine()
</span><span class="cx"> {
</span><span class="cx"> ::GetOptions(
</span><del>- 'input=s' => \$inputFile,
</del><ins>+ 'input=s' => \@inputFiles,
</ins><span class="cx"> 'outputDir=s' => \$outputDir,
</span><span class="cx"> );
</span><span class="cx">
</span><del>- die "You must specify --input <file>" unless length($inputFile);
</del><ins>+ die "You must specify at least one --input <file>" unless scalar(@inputFiles);
</ins><span class="cx">
</span><span class="cx"> ::mkpath($outputDir);
</span><span class="cx">
</span><span class="lines">@@ -99,15 +99,18 @@
</span><span class="cx"> my $object = shift;
</span><span class="cx"> my $generateCode = shift;
</span><span class="cx">
</span><del>- my $file = new IO::File;
- open($file, $inputFile) or die "Failed to open file: $!";
-
</del><span class="cx"> my $InParser = InFilesParser->new();
</span><del>- $InParser->parse($file, \&parameterHandler, \&itemHandler);
</del><span class="cx">
</span><del>- close($file);
- die "Failed to read from file: $inputFile" if (keys %parsedItems == 0);
</del><ins>+ foreach my $inputFile (@inputFiles) {
+ my $file = new IO::File;
+ open($file, $inputFile) or die "Failed to open file: $!";
</ins><span class="cx">
</span><ins>+ $InParser->parse($file, \&parameterHandler, \&itemHandler);
+
+ close($file);
+ die "Failed to read from file: $inputFile" if (keys %parsedItems == 0);
+ }
+
</ins><span class="cx"> &$generateCode(\%parsedParameters, \%parsedItems);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomEventNamesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/EventNames.h (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -27,9 +27,18 @@
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/text/AtomicString.h>
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/EventNamesAdditions.h>)
+#import <WebKitAdditions/EventNamesAdditions.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><ins>+#if !defined(ADDITIONAL_DOM_EVENT_NAMES_FOR_EACH)
+#define ADDITIONAL_DOM_EVENT_NAMES_FOR_EACH(macro)
+#endif
+
</ins><span class="cx"> #define DOM_EVENT_NAMES_FOR_EACH(macro) \
</span><ins>+ ADDITIONAL_DOM_EVENT_NAMES_FOR_EACH(macro) \
</ins><span class="cx"> macro(DOMActivate) \
</span><span class="cx"> macro(DOMCharacterDataModified) \
</span><span class="cx"> macro(DOMContentLoaded) \
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderEmptyClientscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/EmptyClients.cpp (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -44,6 +44,10 @@
</span><span class="cx"> #include "StorageNamespaceProvider.h"
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsIncludes.h>)
+#include <WebKitAdditions/EmptyClientsIncludes.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class EmptyDatabaseProvider final : public DatabaseProvider {
</span><span class="lines">@@ -133,6 +137,10 @@
</span><span class="cx"> pageConfiguration.databaseProvider = adoptRef(new EmptyDatabaseProvider);
</span><span class="cx"> pageConfiguration.storageNamespaceProvider = adoptRef(new EmptyStorageNamespaceProvider);
</span><span class="cx"> pageConfiguration.visitedLinkStore = adoptRef(new EmptyVisitedLinkStore);
</span><ins>+
+#if defined(__has_include) && __has_include(<WebKitAdditions/EmptyClientsFill.cpp>)
+#include <WebKitAdditions/EmptyClientsFill.cpp>
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> class EmptyPopupMenu : public PopupMenu {
</span></span></pre></div>
<a id="trunkSourceWebCorepageMainFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MainFrame.cpp (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -39,6 +39,10 @@
</span><span class="cx"> #include "ServicesOverlayController.h"
</span><span class="cx"> #endif /* PLATFORM(MAC) */
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
+#include <WebKitAdditions/MainFrameIncludes.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> inline MainFrame::MainFrame(Page& page, PageConfiguration& configuration)
</span><span class="lines">@@ -53,6 +57,9 @@
</span><span class="cx"> , m_pageOverlayController(std::make_unique<PageOverlayController>(*this))
</span><span class="cx"> , m_diagnosticLoggingClient(configuration.diagnosticLoggingClient)
</span><span class="cx"> {
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameInitialization.cpp>)
+#include <WebKitAdditions/MainFrameInitialization.cpp>
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MainFrame::~MainFrame()
</span></span></pre></div>
<a id="trunkSourceWebCorepageMainFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MainFrame.h (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,6 +29,10 @@
</span><span class="cx"> #include "Frame.h"
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameIncludes.h>)
+#include <WebKitAdditions/MainFrameIncludes.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class DiagnosticLoggingClient;
</span><span class="lines">@@ -64,6 +68,10 @@
</span><span class="cx">
</span><span class="cx"> WEBCORE_EXPORT DiagnosticLoggingClient& diagnosticLoggingClient() const;
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/MainFrameMembers.h>)
+#include <WebKitAdditions/MainFrameMembers.h>
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> MainFrame(Page&, PageConfiguration&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/PageConfiguration.h (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -29,6 +29,10 @@
</span><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/RefPtr.h>
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationIncludes.h>)
+#include <WebKitAdditions/PageConfigurationIncludes.h>
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><span class="cx"> class AlternativeTextClient;
</span><span class="lines">@@ -73,6 +77,10 @@
</span><span class="cx"> FrameLoaderClient* loaderClientForMainFrame { nullptr };
</span><span class="cx"> DiagnosticLoggingClient* diagnosticLoggingClient { nullptr };
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/PageConfigurationMembers.h>)
+#include <WebKitAdditions/PageConfigurationMembers.h>
+#endif
+
</ins><span class="cx"> RefPtr<ApplicationCacheStorage> applicationCacheStorage;
</span><span class="cx"> RefPtr<DatabaseProvider> databaseProvider;
</span><span class="cx"> RefPtr<StorageNamespaceProvider> storageNamespaceProvider;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformcocoaWebKitAdditionsmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebCore/platform/cocoa/WebKitAdditions.mm (0 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,31 @@
</span><ins>+/*
+ * 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
+
</ins></span></pre></div>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-01-27 Anders Carlsson <andersca@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-01-27 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> [Win] Clean build fix after r195680.
</span></span></pre></div>
<a id="trunkSourceWebKitWebKitxcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/WebKit.xcodeproj/project.pbxproj (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -54,6 +54,7 @@
</span><span class="cx"> 1A74A28F0F4F75400082E228 /* WebTextInputWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */; };
</span><span class="cx"> 1A77B02E0EE7730500C8A1F9 /* WebPluginRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */; };
</span><span class="cx"> 1A77B02F0EE7730500C8A1F9 /* WebPluginRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */; };
</span><ins>+ 1A781ACB1C56FF7C00FB96DD /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */; };
</ins><span class="cx"> 1A86CCD41AD48A620074BA89 /* WebApplicationCacheInternal.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */; };
</span><span class="cx"> 1A8DED500EE88B8A00F25022 /* HostedNetscapePluginStream.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */; };
</span><span class="cx"> 1A8DED510EE88B8A00F25022 /* HostedNetscapePluginStream.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */; };
</span><span class="lines">@@ -512,6 +513,7 @@
</span><span class="cx"> 1A74A28D0F4F75400082E228 /* WebTextInputWindowController.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.c.objc; fileEncoding = 4; path = WebTextInputWindowController.m; sourceTree = "<group>"; };
</span><span class="cx"> 1A77B02C0EE7730500C8A1F9 /* WebPluginRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebPluginRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A77B02D0EE7730500C8A1F9 /* WebPluginRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WebPluginRequest.m; sourceTree = "<group>"; };
</span><ins>+ 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = WebKitAdditions.mm; path = mac/WebKitAdditions.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1A86CCD31AD48A620074BA89 /* WebApplicationCacheInternal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebApplicationCacheInternal.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A8DED4E0EE88B8A00F25022 /* HostedNetscapePluginStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HostedNetscapePluginStream.h; sourceTree = "<group>"; };
</span><span class="cx"> 1A8DED4F0EE88B8A00F25022 /* HostedNetscapePluginStream.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = HostedNetscapePluginStream.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -965,6 +967,7 @@
</span><span class="cx"> F5F732D202FF4D4F01A80180 /* WebKit.exp */,
</span><span class="cx"> 319A3F4D1885E5FB00E0C900 /* WebKit.mac.exp */,
</span><span class="cx"> A10C1D8F1820307D0036883A /* WebKit.iOS.exp */,
</span><ins>+ 1A781AC91C56FF7C00FB96DD /* WebKitAdditions.mm */,
</ins><span class="cx"> F5C283730284676D018635CA /* WebKitPrefix.h */,
</span><span class="cx"> A182B74E199E7B8F001FD95A /* migrate-headers.sh */,
</span><span class="cx"> A182B74F199E7B8F001FD95A /* postprocess-headers.sh */,
</span><span class="lines">@@ -1897,7 +1900,6 @@
</span><span class="cx"> A10C1D3C18202FC50036883A /* WebNSStringExtrasIPhone.h in Headers */,
</span><span class="cx"> 9398107E0824BF01008DF038 /* WebNSURLExtras.h in Headers */,
</span><span class="cx"> 65E0F88408500917007E5CB9 /* WebNSURLRequestExtras.h in Headers */,
</span><del>- E4AEF97C1C0DF4BC00B01727 /* WebResourceLoadScheduler.h in Headers */,
</del><span class="cx"> 65E0F9E608500F23007E5CB9 /* WebNSUserDefaultsExtras.h in Headers */,
</span><span class="cx"> 939810240824BF01008DF038 /* WebNSViewExtras.h in Headers */,
</span><span class="cx"> 939810250824BF01008DF038 /* WebNSWindowExtras.h in Headers */,
</span><span class="lines">@@ -1933,6 +1935,7 @@
</span><span class="cx"> 934C4AA00F0141F7009372C0 /* WebResourceInternal.h in Headers */,
</span><span class="cx"> 939810600824BF01008DF038 /* WebResourceLoadDelegate.h in Headers */,
</span><span class="cx"> 656D333E0AF21AE900212169 /* WebResourceLoadDelegatePrivate.h in Headers */,
</span><ins>+ E4AEF97C1C0DF4BC00B01727 /* WebResourceLoadScheduler.h in Headers */,
</ins><span class="cx"> 939810890824BF01008DF038 /* WebResourcePrivate.h in Headers */,
</span><span class="cx"> 7E6FEF0808985A7200C44C3F /* WebScriptDebugDelegate.h in Headers */,
</span><span class="cx"> C0167BF80D7F5DD00028696E /* WebScriptDebugger.h in Headers */,
</span><span class="lines">@@ -2246,7 +2249,6 @@
</span><span class="cx"> BC7F889F10C9D30C00D6133D /* WebGeolocationPosition.mm in Sources */,
</span><span class="cx"> A10C1D3718202FC50036883A /* WebGeolocationProviderIOS.mm in Sources */,
</span><span class="cx"> 939811130824BF01008DF038 /* WebHistory.mm in Sources */,
</span><del>- E4AEF97B1C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp in Sources */,
</del><span class="cx"> 939810BD0824BF01008DF038 /* WebHistoryItem.mm in Sources */,
</span><span class="cx"> 1AAF5FC00EDE3A92008D883D /* WebHostedNetscapePluginView.mm in Sources */,
</span><span class="cx"> 939810F30824BF01008DF038 /* WebHTMLRepresentation.mm in Sources */,
</span><span class="lines">@@ -2264,6 +2266,7 @@
</span><span class="cx"> 37D1DCA91065928C0068F7EF /* WebJSPDFDoc.mm in Sources */,
</span><span class="cx"> 939811170824BF01008DF038 /* WebKeyGenerator.mm in Sources */,
</span><span class="cx"> 939811030824BF01008DF038 /* WebKitErrors.m in Sources */,
</span><ins>+ 1A781ACB1C56FF7C00FB96DD /* WebKitAdditions.mm in Sources */,
</ins><span class="cx"> CD8BFCE715531224005AFB25 /* WebKitFullScreenListener.mm in Sources */,
</span><span class="cx"> 939810C30824BF01008DF038 /* WebKitLogging.m in Sources */,
</span><span class="cx"> 939810C40824BF01008DF038 /* WebKitNSStringExtras.mm in Sources */,
</span><span class="lines">@@ -2324,6 +2327,7 @@
</span><span class="cx"> 939810F80824BF01008DF038 /* WebPreferences.mm in Sources */,
</span><span class="cx"> 1A6A208D1886154600E50F5F /* WebProgressTrackerClient.mm in Sources */,
</span><span class="cx"> 9398111A0824BF01008DF038 /* WebResource.mm in Sources */,
</span><ins>+ E4AEF97B1C0DF4BC00B01727 /* WebResourceLoadScheduler.cpp in Sources */,
</ins><span class="cx"> 7E6FEF0908985A7200C44C3F /* WebScriptDebugDelegate.mm in Sources */,
</span><span class="cx"> C0167BF90D7F5DD00028696E /* WebScriptDebugger.mm in Sources */,
</span><span class="cx"> C0B1F7E910AC8E3100C925D9 /* WebScriptWorld.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-01-27 Anders Carlsson <andersca@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-01-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> window.atob() should ignore spaces in input
</span></span></pre></div>
<a id="trunkSourceWebKitmacConfigurationsWebKitLegacyxcconfig"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Configurations/WebKitLegacy.xcconfig (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -48,7 +48,9 @@
</span><span class="cx">
</span><span class="cx"> GCC_PREFIX_HEADER = mac/WebKitPrefix.h;
</span><span class="cx"> GCC_PREPROCESSOR_DEFINITIONS = $(DEBUG_DEFINES) $(FEATURE_DEFINES) FRAMEWORK_NAME=WebKitLegacy $(inherited);
</span><del>-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);
</del><ins>+
+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);
</ins><span class="cx"> INFOPLIST_FILE = mac/Info.plist;
</span><span class="cx"> INSTALL_PATH = $(SYSTEM_LIBRARY_DIR)/PrivateFrameworks;
</span><span class="cx"> INSTALL_PATH[sdk=macosx*] = $(WEBKIT_LEGACY_FRAMEWORKS_DIR);
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebKitAdditionsmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit/mac/WebKitAdditions.mm (0 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebKitAdditions.mm (rev 0)
+++ trunk/Source/WebKit/mac/WebKitAdditions.mm 2016-01-27 23:12:31 UTC (rev 195698)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebView.mm (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -295,6 +295,10 @@
</span><span class="cx"> #import <WebCore/WebMediaSessionManagerMac.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewIncludes.h>)
+#import <WebKitAdditions/WebViewIncludes.h>
+#endif
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> SOFT_LINK_CONSTANT_MAY_FAIL(Lookup, LUNotificationPopoverWillClose, NSString *)
</span><span class="cx"> #endif
</span><span class="lines">@@ -968,6 +972,11 @@
</span><span class="cx"> pageConfiguration.chromeClient = new WebChromeClientIOS(self);
</span><span class="cx"> pageConfiguration.inspectorClient = new WebInspectorClient(self);
</span><span class="cx"> #endif
</span><ins>+
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
+#import <WebKitAdditions/WebViewInitialization.mm>
+#endif
+
</ins><span class="cx"> pageConfiguration.editorClient = new WebEditorClient(self);
</span><span class="cx"> pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(self);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="lines">@@ -1207,6 +1216,11 @@
</span><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> pageConfiguration.dragClient = new WebDragClient(self);
</span><span class="cx"> #endif
</span><ins>+
+#if defined(__has_include) && __has_include(<WebKitAdditions/WebViewInitialization.mm>)
+#import <WebKitAdditions/WebViewInitialization.mm>
+#endif
+
</ins><span class="cx"> pageConfiguration.editorClient = new WebEditorClient(self);
</span><span class="cx"> pageConfiguration.inspectorClient = new WebInspectorClient(self);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,34 @@
</span><ins>+2016-01-27 Anders Carlsson <andersca@apple.com>
+
+ 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.
+
</ins><span class="cx"> 2016-01-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> window.atob() should ignore spaces in input
</span></span></pre></div>
<a id="trunkSourceWebKit2DerivedSourcesmake"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/DerivedSources.make (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -67,6 +67,7 @@
</span><span class="cx"> $(WebKit2)/UIProcess/UserContent \
</span><span class="cx"> $(WebKit2)/UIProcess/mac \
</span><span class="cx"> $(WebKit2)/UIProcess/ios \
</span><ins>+ $(WEBKITADDITIONS_HEADER_SEARCH_PATHS) \
</ins><span class="cx"> #
</span><span class="cx">
</span><span class="cx"> MESSAGE_RECEIVERS = \
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedCocoaWebKitAdditionsmm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/Shared/Cocoa/WebKitAdditions.mm (0 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+/*
+ * 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
</ins></span></pre></div>
<a id="trunkSourceWebKit2SharedWebCoreArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebCoreArgumentCoders.h (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -465,4 +465,8 @@
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebCoreArgumentCodersAdditions.h>)
+#include <WebKitAdditions/WebCoreArgumentCodersAdditions.h>
+#endif
+
</ins><span class="cx"> #endif // WebCoreArgumentCoders_h
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -168,6 +168,10 @@
</span><span class="cx"> #include <WebCore/MediaSessionMetadata.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
+#include <WebKitAdditions/WebPageProxyIncludes.h>
+#endif
+
</ins><span class="cx"> // This controls what strategy we use for mouse wheel coalescing.
</span><span class="cx"> #define MERGE_WHEEL_EVENTS 1
</span><span class="cx">
</span><span class="lines">@@ -473,6 +477,10 @@
</span><span class="cx"> m_vibration = WebVibrationProxy::create(this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.h>)
+#include <WebKitAdditions/WebPageProxyInitialization.h>
+#endif
+
</ins><span class="cx"> m_process->addMessageReceiver(Messages::WebPageProxy::messageReceiverName(), m_pageID, *this);
</span><span class="cx">
</span><span class="cx"> if (m_sessionID.isEphemeral())
</span><span class="lines">@@ -701,6 +709,10 @@
</span><span class="cx"> m_videoFullscreenManager = WebVideoFullscreenManagerProxy::create(*this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInitialization.h>)
+#include <WebKitAdditions/WebPageProxyInitialization.h>
+#endif
+
</ins><span class="cx"> initializeWebPage();
</span><span class="cx">
</span><span class="cx"> m_pageClient.didRelaunchProcess();
</span><span class="lines">@@ -5032,6 +5044,10 @@
</span><span class="cx"> m_pageClient.mediaSessionManager().removeAllPlaybackTargetPickerClients(*this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyInvalidation.h>)
+#include <WebKitAdditions/WebPageProxyInvalidation.h>
+#endif
+
</ins><span class="cx"> CallbackBase::Error error;
</span><span class="cx"> switch (resetStateReason) {
</span><span class="cx"> case ResetStateReason::PageInvalidated:
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -122,6 +122,10 @@
</span><span class="cx"> #include <WebCore/WebMediaSessionManagerClient.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyIncludes.h>)
+#include <WebKitAdditions/WebPageProxyIncludes.h>
+#endif
+
</ins><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class MediaSessionMetadata;
</span><span class="lines">@@ -1539,6 +1543,10 @@
</span><span class="cx"> RefPtr<WebVibrationProxy> m_vibration;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageProxyMembers.h>)
+#include <WebKitAdditions/WebPageProxyMembers.h>
+#endif
+
</ins><span class="cx"> CallbackMap m_callbacks;
</span><span class="cx"> HashSet<uint64_t> m_loadDependentStringCallbackIDs;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -308,6 +308,7 @@
</span><span class="cx"> 1A6FBD2811E69BC200DB1371 /* NetscapePlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A6FBD2611E69BC200DB1371 /* NetscapePlugin.h */; };
</span><span class="cx"> 1A6FBD2911E69BC200DB1371 /* NetscapePlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */; };
</span><span class="cx"> 1A7284481959F8040007BCE5 /* SessionStateConversion.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7284441959ED100007BCE5 /* SessionStateConversion.cpp */; };
</span><ins>+ 1A781AE71C5714DA00FB96DD /* WebKitAdditions.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A781AE51C5714DA00FB96DD /* WebKitAdditions.mm */; };
</ins><span class="cx"> 1A7865B916CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */; };
</span><span class="cx"> 1A7865BA16CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */; };
</span><span class="cx"> 1A7C0DF61B7D1F1000A9B848 /* WKWindowFeaturesRef.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 1A7C0DF41B7D1F1000A9B848 /* WKWindowFeaturesRef.cpp */; };
</span><span class="lines">@@ -2416,6 +2417,7 @@
</span><span class="cx"> 1A6FBD2711E69BC200DB1371 /* NetscapePlugin.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NetscapePlugin.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A7284441959ED100007BCE5 /* SessionStateConversion.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SessionStateConversion.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A7284451959ED100007BCE5 /* SessionStateConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SessionStateConversion.h; sourceTree = "<group>"; };
</span><ins>+ 1A781AE51C5714DA00FB96DD /* WebKitAdditions.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WebKitAdditions.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 1A7865B616CAC6FD00ACE83A /* PluginProcessConnectionManager.messages.in */ = {isa = PBXFileReference; lastKnownFileType = text; path = PluginProcessConnectionManager.messages.in; sourceTree = "<group>"; };
</span><span class="cx"> 1A7865B716CAC71500ACE83A /* PluginProcessConnectionManagerMessageReceiver.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PluginProcessConnectionManagerMessageReceiver.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 1A7865B816CAC71500ACE83A /* PluginProcessConnectionManagerMessages.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PluginProcessConnectionManagerMessages.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5416,6 +5418,7 @@
</span><span class="cx"> 378E1A3B181ED6FF0031007A /* APIObject.mm */,
</span><span class="cx"> 37BEC4DF19491486008B4286 /* CompletionHandlerCallChecker.h */,
</span><span class="cx"> 37BEC4DE19491486008B4286 /* CompletionHandlerCallChecker.mm */,
</span><ins>+ 1A781AE51C5714DA00FB96DD /* WebKitAdditions.mm */,
</ins><span class="cx"> 37C4C0921814B3AF003688B9 /* WKNSArray.h */,
</span><span class="cx"> 37C4C0911814B3AF003688B9 /* WKNSArray.mm */,
</span><span class="cx"> 373CEAD4185417AE008C363D /* WKNSData.h */,
</span><span class="lines">@@ -9562,6 +9565,7 @@
</span><span class="cx"> 516319921628980A00E22F00 /* NetworkProcessProxyMac.mm in Sources */,
</span><span class="cx"> 513A163C163088F6005D7D22 /* NetworkProcessProxyMessageReceiver.cpp in Sources */,
</span><span class="cx"> 51FD18B51651FBAD00DBE1CE /* NetworkResourceLoader.cpp in Sources */,
</span><ins>+ 1A781AE71C5714DA00FB96DD /* WebKitAdditions.mm in Sources */,
</ins><span class="cx"> 51E3B67F16F266B3009968DC /* NetworkResourceLoaderMac.mm in Sources */,
</span><span class="cx"> E152551A17011819003D7ADB /* NetworkResourceLoaderMessageReceiver.cpp in Sources */,
</span><span class="cx"> BC8283AC16B4BF3F00A278FE /* NetworkServiceEntryPoint.mm in Sources */,
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (195697 => 195698)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -227,6 +227,10 @@
</span><span class="cx"> #include <WebCore/MediaPlayerRequestInstallMissingPluginsCallback.h>
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageIncludes.h>)
+#include <WebKitAdditions/WebPageIncludes.h>
+#endif
+
</ins><span class="cx"> using namespace JSC;
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="lines">@@ -379,6 +383,7 @@
</span><span class="cx"> #if USE(AUTOCORRECTION_PANEL)
</span><span class="cx"> pageConfiguration.alternativeTextClient = new WebAlternativeTextClient(this);
</span><span class="cx"> #endif
</span><ins>+
</ins><span class="cx"> pageConfiguration.plugInClient = new WebPlugInClient(*this);
</span><span class="cx"> pageConfiguration.loaderClientForMainFrame = new WebFrameLoaderClient;
</span><span class="cx"> pageConfiguration.progressTrackerClient = new WebProgressTrackerClient(*this);
</span><span class="lines">@@ -389,6 +394,10 @@
</span><span class="cx"> pageConfiguration.userContentController = m_userContentController ? &m_userContentController->userContentController() : &m_pageGroup->userContentController();
</span><span class="cx"> pageConfiguration.visitedLinkStore = VisitedLinkTableController::getOrCreate(parameters.visitedLinkTableID);
</span><span class="cx">
</span><ins>+#if defined(__has_include) && __has_include(<WebKitAdditions/WebPageInitialization.h>)
+#include <WebKitAdditions/WebPageInitialization.h>
+#endif
+
</ins><span class="cx"> m_page = std::make_unique<Page>(pageConfiguration);
</span><span class="cx">
</span><span class="cx"> m_drawingArea = DrawingArea::create(*this, parameters);
</span></span></pre>
</div>
</div>
</body>
</html>