<!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>[169812] trunk/Source/WebKit2</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/169812">169812</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-06-11 10:44:56 -0700 (Wed, 11 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move suppressesIncrementalRendering to WKWebViewConfiguration
https://bugs.webkit.org/show_bug.cgi?id=133707
<rdar://problem/17271468>
Reviewed by Sam Weinig.
* UIProcess/API/Cocoa/WKPreferences.h:
Get rid of suppressesIncrementalRendering.
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView initWithFrame:configuration:]):
Set the suppressesIncrementalRenderingKey key in webPageConfiguration.preferenceValues.
* UIProcess/API/Cocoa/WKWebViewConfiguration.h:
Add suppressesIncrementalRendering.
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration copyWithZone:]):
Assign suppressesIncrementalRendering.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
Copy webPageConfiguration.preferenceValues to m_configurationPreferenceValues.
(WebKit::WebPageProxy::preferencesStore):
If m_configurationPreferenceValues is empty, just return m_preferences->store(). Otherwise,
copy the store and apply the configuration preference values.
(WebKit::WebPageProxy::preferencesDidChange):
Call preferencesStore() so we'll get the configuration preference values as well.
(WebKit::WebPageProxy::creationParameters):
Ditto.
* UIProcess/WebPageProxy.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (169811 => 169812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-06-11 17:27:30 UTC (rev 169811)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-11 17:44:56 UTC (rev 169812)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+2014-06-10 Anders Carlsson <andersca@apple.com>
+
+ Move suppressesIncrementalRendering to WKWebViewConfiguration
+ https://bugs.webkit.org/show_bug.cgi?id=133707
+ <rdar://problem/17271468>
+
+ Reviewed by Sam Weinig.
+
+ * UIProcess/API/Cocoa/WKPreferences.h:
+ Get rid of suppressesIncrementalRendering.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView initWithFrame:configuration:]):
+ Set the suppressesIncrementalRenderingKey key in webPageConfiguration.preferenceValues.
+
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.h:
+ Add suppressesIncrementalRendering.
+
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration copyWithZone:]):
+ Assign suppressesIncrementalRendering.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ Copy webPageConfiguration.preferenceValues to m_configurationPreferenceValues.
+
+ (WebKit::WebPageProxy::preferencesStore):
+ If m_configurationPreferenceValues is empty, just return m_preferences->store(). Otherwise,
+ copy the store and apply the configuration preference values.
+
+ (WebKit::WebPageProxy::preferencesDidChange):
+ Call preferencesStore() so we'll get the configuration preference values as well.
+
+ (WebKit::WebPageProxy::creationParameters):
+ Ditto.
+
+ * UIProcess/WebPageProxy.h:
+
</ins><span class="cx"> 2014-06-11 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Wrap NSURLRequest in bundle API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKPreferencesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h (169811 => 169812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-06-11 17:27:30 UTC (rev 169811)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKPreferences.h 2014-06-11 17:44:56 UTC (rev 169812)
</span><span class="lines">@@ -67,12 +67,6 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic) BOOL javaScriptCanOpenWindowsAutomatically;
</span><span class="cx">
</span><del>-/*! @abstract A Boolean value indicating whether the web view suppresses
- content rendering until it is fully loaded into memory.
- @discussion The default value is NO.
- */
-@property (nonatomic) BOOL suppressesIncrementalRendering;
-
</del><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> /*! @abstract A Boolean value indicating whether HTML5 videos play inline
</span><span class="cx"> (YES) or use the native full-screen controller (NO).
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (169811 => 169812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-11 17:27:30 UTC (rev 169811)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-06-11 17:44:56 UTC (rev 169812)
</span><span class="lines">@@ -60,6 +60,7 @@
</span><span class="cx"> #import "WebKitSystemInterface.h"
</span><span class="cx"> #import "WebPageGroup.h"
</span><span class="cx"> #import "WebPageProxy.h"
</span><ins>+#import "WebPreferencesKeys.h"
</ins><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import "WebSerializedScriptValue.h"
</span><span class="cx"> #import "_WKFindDelegate.h"
</span><span class="lines">@@ -249,6 +250,8 @@
</span><span class="cx"> webPageConfiguration.pageGroup = pageGroup.get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ webPageConfiguration.preferenceValues.set(WebKit::WebPreferencesKey::suppressesIncrementalRenderingKey(), WebKit::WebPreferencesStore::Value(!![_configuration suppressesIncrementalRendering]));
+
</ins><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> _scrollView = adoptNS([[WKScrollView alloc] initWithFrame:bounds]);
</span><span class="cx"> [_scrollView setInternalDelegate:self];
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h (169811 => 169812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-06-11 17:27:30 UTC (rev 169811)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.h 2014-06-11 17:44:56 UTC (rev 169812)
</span><span class="lines">@@ -56,6 +56,12 @@
</span><span class="cx"> */
</span><span class="cx"> @property (nonatomic, strong) WKUserContentController *userContentController;
</span><span class="cx">
</span><ins>+/*! @abstract A Boolean value indicating whether the web view suppresses
+ content rendering until it is fully loaded into memory.
+ @discussion The default value is NO.
+ */
+@property (nonatomic) BOOL suppressesIncrementalRendering;
+
</ins><span class="cx"> @end
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (169811 => 169812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-06-11 17:27:30 UTC (rev 169811)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2014-06-11 17:44:56 UTC (rev 169812)
</span><span class="lines">@@ -98,6 +98,8 @@
</span><span class="cx"> configuration._contentProviderRegistry = self._contentProviderRegistry;
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ configuration->_suppressesIncrementalRendering = self->_suppressesIncrementalRendering;
+
</ins><span class="cx"> return configuration;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (169811 => 169812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-11 17:27:30 UTC (rev 169811)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2014-06-11 17:44:56 UTC (rev 169812)
</span><span class="lines">@@ -364,6 +364,7 @@
</span><span class="cx"> , m_waitingForDidUpdateViewState(false)
</span><span class="cx"> , m_scrollPinningBehavior(DoNotPin)
</span><span class="cx"> , m_navigationID(0)
</span><ins>+ , m_configurationPreferenceValues(configuration.preferenceValues)
</ins><span class="cx"> {
</span><span class="cx"> if (m_process->state() == WebProcessProxy::State::Running) {
</span><span class="cx"> if (m_userContentController)
</span><span class="lines">@@ -1498,6 +1499,18 @@
</span><span class="cx"> return ++m_navigationID;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+WebPreferencesStore WebPageProxy::preferencesStore() const
+{
+ if (m_configurationPreferenceValues.isEmpty())
+ return m_preferences->store();
+
+ WebPreferencesStore store = m_preferences->store();
+ for (const auto& preference : m_configurationPreferenceValues)
+ store.m_values.set(preference.key, preference.value);
+
+ return store;
+}
+
</ins><span class="cx"> #if ENABLE(NETSCAPE_PLUGIN_API)
</span><span class="cx"> void WebPageProxy::findPlugin(const String& mimeType, uint32_t processType, const String& urlString, const String& frameURLString, const String& pageURLString, bool allowOnlyApplicationPlugins, uint64_t& pluginProcessToken, String& newMimeType, uint32_t& pluginLoadPolicy, String& unavailabilityDescription)
</span><span class="cx"> {
</span><span class="lines">@@ -2322,7 +2335,7 @@
</span><span class="cx"> // even if nothing changed in UI process, so that overrides get removed.
</span><span class="cx">
</span><span class="cx"> // Preferences need to be updated during synchronous printing to make "print backgrounds" preference work when toggled from a print dialog checkbox.
</span><del>- m_process->send(Messages::WebPage::PreferencesDidChange(m_preferences->store()), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
</del><ins>+ m_process->send(Messages::WebPage::PreferencesDidChange(preferencesStore()), m_pageID, m_isPerformingDOMPrintOperation ? IPC::DispatchMessageEvenWhenWaitingForSyncReply : 0);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPageProxy::didCreateMainFrame(uint64_t frameID)
</span><span class="lines">@@ -4339,7 +4352,7 @@
</span><span class="cx"> parameters.viewSize = m_pageClient.viewSize();
</span><span class="cx"> parameters.viewState = m_viewState;
</span><span class="cx"> parameters.drawingAreaType = m_drawingArea->type();
</span><del>- parameters.store = m_preferences->store();
</del><ins>+ parameters.store = preferencesStore();
</ins><span class="cx"> parameters.pageGroupData = m_pageGroup->data();
</span><span class="cx"> parameters.drawsBackground = m_drawsBackground;
</span><span class="cx"> parameters.drawsTransparentBackground = m_drawsTransparentBackground;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (169811 => 169812)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-11 17:27:30 UTC (rev 169811)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2014-06-11 17:44:56 UTC (rev 169812)
</span><span class="lines">@@ -433,6 +433,8 @@
</span><span class="cx">
</span><span class="cx"> API::Session* session = nullptr;
</span><span class="cx"> WebPageProxy* relatedPage = nullptr;
</span><ins>+
+ WebPreferencesStore::ValueMap preferenceValues;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class WebPageProxy : public API::ObjectImpl<API::Object::Type::Page>
</span><span class="lines">@@ -1454,6 +1456,8 @@
</span><span class="cx">
</span><span class="cx"> uint64_t generateNavigationID();
</span><span class="cx">
</span><ins>+ WebPreferencesStore preferencesStore() const;
+
</ins><span class="cx"> PageClient& m_pageClient;
</span><span class="cx"> std::unique_ptr<API::LoaderClient> m_loaderClient;
</span><span class="cx"> std::unique_ptr<API::PolicyClient> m_policyClient;
</span><span class="lines">@@ -1717,6 +1721,8 @@
</span><span class="cx"> WebCore::ScrollPinningBehavior m_scrollPinningBehavior;
</span><span class="cx">
</span><span class="cx"> uint64_t m_navigationID;
</span><ins>+
+ WebPreferencesStore::ValueMap m_configurationPreferenceValues;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre>
</div>
</div>
</body>
</html>