<!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>[197041] 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/197041">197041</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-02-24 12:31:40 -0800 (Wed, 24 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add more WebKitAdditions extension points
https://bugs.webkit.org/show_bug.cgi?id=154648
rdar://problem/24820040
Reviewed by Beth Dakin.
* Shared/WebPreferencesDefinitions.h:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::updatePreferences):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCorepageSettingsh">trunk/Source/WebCore/page/Settings.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPreferencesDefinitionsh">trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCorepageSettingsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Settings.h (197040 => 197041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Settings.h 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebCore/page/Settings.h 2016-02-24 20:31:40 UTC (rev 197041)
</span><span class="lines">@@ -287,6 +287,10 @@
</span><span class="cx"> WEBCORE_EXPORT static float defaultMinimumZoomFontSize();
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/SettingsGettersAndSetters.h>
+#endif
+
</ins><span class="cx"> private:
</span><span class="cx"> explicit Settings(Page*);
</span><span class="cx">
</span><span class="lines">@@ -381,6 +385,10 @@
</span><span class="cx">
</span><span class="cx"> static bool gLowPowerVideoAudioBufferSizeEnabled;
</span><span class="cx"> static bool gResourceLoadStatisticsEnabledEnabled;
</span><ins>+
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/SettingsMembers.h>
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (197040 => 197041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/ChangeLog 2016-02-24 20:31:40 UTC (rev 197041)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-02-24 Anders Carlsson <andersca@apple.com>
+
+ Add more WebKitAdditions extension points
+ https://bugs.webkit.org/show_bug.cgi?id=154648
+ rdar://problem/24820040
+
+ Reviewed by Beth Dakin.
+
+ * Shared/WebPreferencesDefinitions.h:
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::updatePreferences):
+
</ins><span class="cx"> 2016-02-24 Ryosuke Niwa <rniwa@webkit.org>
</span><span class="cx">
</span><span class="cx"> Move FocusNavigationScope into FocusController.cpp
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPreferencesDefinitionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h (197040 => 197041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/Shared/WebPreferencesDefinitions.h 2016-02-24 20:31:40 UTC (rev 197041)
</span><span class="lines">@@ -26,6 +26,14 @@
</span><span class="cx"> #ifndef WebPreferencesDefinitions_h
</span><span class="cx"> #define WebPreferencesDefinitions_h
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WebPreferencesDefinitionsAdditions.h>
+#endif
+
+#if !defined(FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE)
+#define FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro)
+#endif
+
</ins><span class="cx"> #if PLATFORM(GTK)
</span><span class="cx"> #define DEFAULT_WEBKIT_TABSTOLINKS_ENABLED true
</span><span class="cx"> #else
</span><span class="lines">@@ -216,6 +224,8 @@
</span><span class="cx"> macro(AntialiasedFontDilationEnabled, antialiasedFontDilationEnabled, Bool, bool, false) \
</span><span class="cx"> macro(HTTPEquivEnabled, httpEquivEnabled, Bool, bool, true) \
</span><span class="cx"> macro(MockCaptureDevicesEnabled, mockCaptureDevicesEnabled, Bool, bool, false) \
</span><ins>+ FOR_EACH_ADDITIONAL_WEBKIT_BOOL_PREFERENCE(macro) \
+ \
</ins><span class="cx">
</span><span class="cx"> #define FOR_EACH_WEBKIT_DOUBLE_PREFERENCE(macro) \
</span><span class="cx"> macro(IncrementalRenderingSuppressionTimeout, incrementalRenderingSuppressionTimeout, Double, double, 5) \
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (197040 => 197041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-02-24 20:31:40 UTC (rev 197041)
</span><span class="lines">@@ -410,6 +410,10 @@
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowsAirPlayForMediaPlaybackKey(), WebKit::WebPreferencesStore::Value(!![_configuration allowsAirPlayForMediaPlayback]));
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewInitialization.mm>
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> CGRect bounds = self.bounds;
</span><span class="cx"> _scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (197040 => 197041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-02-24 20:31:40 UTC (rev 197041)
</span><span class="lines">@@ -112,6 +112,10 @@
</span><span class="cx"> BOOL _serviceControlsEnabled;
</span><span class="cx"> BOOL _imageControlsEnabled;
</span><span class="cx"> #endif
</span><ins>+
+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewConfigurationIvars.mm>
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)init
</span><span class="lines">@@ -252,6 +256,10 @@
</span><span class="cx"> configuration->_allowsAirPlayForMediaPlayback = self->_allowsAirPlayForMediaPlayback;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewConfigurationCopy.mm>
+#endif
+
</ins><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -573,6 +581,10 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(MAC)
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#import <WebKitAdditions/WKWebViewConfigurationPrivateMethods.mm>
+#endif
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> @implementation WKWebViewConfiguration (WKDeprecated)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (197040 => 197041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-24 20:26:01 UTC (rev 197040)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2016-02-24 20:31:40 UTC (rev 197041)
</span><span class="lines">@@ -3007,6 +3007,10 @@
</span><span class="cx">
</span><span class="cx"> settings.setShouldDispatchJavaScriptWindowOnErrorEvents(true);
</span><span class="cx">
</span><ins>+#if USE(APPLE_INTERNAL_SDK)
+#include <WebKitAdditions/WebPagePreferences.cpp>
+#endif
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> settings.setUseImageDocumentForSubframePDF(true);
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>