<!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>[207292] 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/207292">207292</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2016-10-13 10:44:27 -0700 (Thu, 13 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Expose SPI to disable synchronously blocking on painting after parenting a WKWebView
https://bugs.webkit.org/show_bug.cgi?id=163364
<rdar://problem/28012494>
Reviewed by Geoff Garen.
Some clients may not want the default WKWebView behavior where we synchronously
block on the Web process after the first time a WKWebView is re-added to the window,
because they are e.g. parenting re-used WKWebViews while scrolling.
* UIProcess/API/APIPageConfiguration.h:
(API::PageConfiguration::shouldSynchronizeInitialPaintAfterMovingToWindow):
(API::PageConfiguration::setShouldSynchronizeInitialPaintAfterMovingToWindow):
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _initializeWithConfiguration:]):
* UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
(-[WKWebViewConfiguration init]):
(-[WKWebViewConfiguration copyWithZone:]):
(-[WKWebViewConfiguration _shouldSynchronizeInitialPaintAfterMovingToWindow]):
(-[WKWebViewConfiguration _setShouldSynchronizeInitialPaintAfterMovingToWindow:]):
* UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
* UIProcess/WebPageProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
Add and plumb a new WKWebView configuration parameter.
(WebKit::WebPageProxy::dispatchViewStateChange):
If the new configuration parameter is set, don't block the main thread when
a view is reparented.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIPageConfigurationh">trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.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="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207291 => 207292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-13 17:25:24 UTC (rev 207291)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-13 17:44:27 UTC (rev 207292)
</span><span class="lines">@@ -1,3 +1,35 @@
</span><ins>+2016-10-13 Tim Horton <timothy_horton@apple.com>
+
+ Expose SPI to disable synchronously blocking on painting after parenting a WKWebView
+ https://bugs.webkit.org/show_bug.cgi?id=163364
+ <rdar://problem/28012494>
+
+ Reviewed by Geoff Garen.
+
+ Some clients may not want the default WKWebView behavior where we synchronously
+ block on the Web process after the first time a WKWebView is re-added to the window,
+ because they are e.g. parenting re-used WKWebViews while scrolling.
+
+ * UIProcess/API/APIPageConfiguration.h:
+ (API::PageConfiguration::shouldSynchronizeInitialPaintAfterMovingToWindow):
+ (API::PageConfiguration::setShouldSynchronizeInitialPaintAfterMovingToWindow):
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _initializeWithConfiguration:]):
+ * UIProcess/API/Cocoa/WKWebViewConfiguration.mm:
+ (-[WKWebViewConfiguration init]):
+ (-[WKWebViewConfiguration copyWithZone:]):
+ (-[WKWebViewConfiguration _shouldSynchronizeInitialPaintAfterMovingToWindow]):
+ (-[WKWebViewConfiguration _setShouldSynchronizeInitialPaintAfterMovingToWindow:]):
+ * UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h:
+ * UIProcess/WebPageProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ Add and plumb a new WKWebView configuration parameter.
+
+ (WebKit::WebPageProxy::dispatchViewStateChange):
+ If the new configuration parameter is set, don't block the main thread when
+ a view is reparented.
+
</ins><span class="cx"> 2016-10-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [Web IDL] Drop support for legacy [ConstructorConditional=*]
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIPageConfigurationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h (207291 => 207292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2016-10-13 17:25:24 UTC (rev 207291)
+++ trunk/Source/WebKit2/UIProcess/API/APIPageConfiguration.h 2016-10-13 17:44:27 UTC (rev 207292)
</span><span class="lines">@@ -92,6 +92,9 @@
</span><span class="cx"> bool initialCapitalizationEnabled() { return m_initialCapitalizationEnabled; }
</span><span class="cx"> void setInitialCapitalizationEnabled(bool initialCapitalizationEnabled) { m_initialCapitalizationEnabled = initialCapitalizationEnabled; }
</span><span class="cx">
</span><ins>+ bool shouldWaitForPaintAfterViewDidMoveToWindow() const { return m_shouldWaitForPaintAfterViewDidMoveToWindow; }
+ void setShouldWaitForPaintAfterViewDidMoveToWindow(bool shouldSynchronize) { m_shouldWaitForPaintAfterViewDidMoveToWindow = shouldSynchronize; }
+
</ins><span class="cx"> private:
</span><span class="cx">
</span><span class="cx"> RefPtr<WebKit::WebProcessPool> m_processPool;
</span><span class="lines">@@ -112,6 +115,7 @@
</span><span class="cx"> bool m_alwaysRunsAtForegroundPriority = false;
</span><span class="cx"> #endif
</span><span class="cx"> bool m_initialCapitalizationEnabled = true;
</span><ins>+ bool m_shouldWaitForPaintAfterViewDidMoveToWindow = true;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (207291 => 207292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-13 17:25:24 UTC (rev 207291)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2016-10-13 17:44:27 UTC (rev 207292)
</span><span class="lines">@@ -438,6 +438,7 @@
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::httpEquivEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowsMetaRefresh]));
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::allowUniversalAccessFromFileURLsKey(), WebKit::WebPreferencesStore::Value(!![_configuration _allowUniversalAccessFromFileURLs]));
</span><span class="cx"> pageConfiguration->setInitialCapitalizationEnabled([_configuration _initialCapitalizationEnabled]);
</span><ins>+ pageConfiguration->setShouldWaitForPaintAfterViewDidMoveToWindow([_configuration _shouldWaitForPaintAfterViewDidMoveToWindow]);
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> pageConfiguration->preferenceValues().set(WebKit::WebPreferencesKey::showsURLsInToolTipsEnabledKey(), WebKit::WebPreferencesStore::Value(!![_configuration _showsURLsInToolTips]));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (207291 => 207292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-10-13 17:25:24 UTC (rev 207291)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfiguration.mm 2016-10-13 17:44:27 UTC (rev 207292)
</span><span class="lines">@@ -123,6 +123,7 @@
</span><span class="cx"> BOOL _requiresUserActionForEditingControlsManager;
</span><span class="cx"> #endif
</span><span class="cx"> BOOL _initialCapitalizationEnabled;
</span><ins>+ BOOL _shouldWaitForPaintAfterViewDidMoveToWindow;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(APPLE_PAY)
</span><span class="cx"> BOOL _applePayEnabled;
</span><span class="lines">@@ -174,6 +175,7 @@
</span><span class="cx"> _requiresUserActionForEditingControlsManager = NO;
</span><span class="cx"> #endif
</span><span class="cx"> _initialCapitalizationEnabled = YES;
</span><ins>+ _shouldWaitForPaintAfterViewDidMoveToWindow = YES;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(WIRELESS_PLAYBACK_TARGET)
</span><span class="cx"> _allowsAirPlayForMediaPlayback = YES;
</span><span class="lines">@@ -284,6 +286,7 @@
</span><span class="cx"> configuration->_mediaTypesRequiringUserActionForPlayback = self->_mediaTypesRequiringUserActionForPlayback;
</span><span class="cx"> configuration->_mainContentUserGestureOverrideEnabled = self->_mainContentUserGestureOverrideEnabled;
</span><span class="cx"> configuration->_initialCapitalizationEnabled = self->_initialCapitalizationEnabled;
</span><ins>+ configuration->_shouldWaitForPaintAfterViewDidMoveToWindow = self->_shouldWaitForPaintAfterViewDidMoveToWindow;
</ins><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> configuration->_allowsInlineMediaPlayback = self->_allowsInlineMediaPlayback;
</span><span class="lines">@@ -655,6 +658,16 @@
</span><span class="cx"> _initialCapitalizationEnabled = initialCapitalizationEnabled;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (BOOL)_shouldWaitForPaintAfterViewDidMoveToWindow
+{
+ return _shouldWaitForPaintAfterViewDidMoveToWindow;
+}
+
+- (void)_setShouldWaitForPaintAfterViewDidMoveToWindow:(BOOL)shouldSynchronize
+{
+ _shouldWaitForPaintAfterViewDidMoveToWindow = shouldSynchronize;
+}
+
</ins><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx"> - (BOOL)_showsURLsInToolTips
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewConfigurationPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h (207291 => 207292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-10-13 17:25:24 UTC (rev 207291)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewConfigurationPrivate.h 2016-10-13 17:44:27 UTC (rev 207292)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> @property (nonatomic, setter=_setAttachmentElementEnabled:) BOOL _attachmentElementEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setInitialCapitalizationEnabled:) BOOL _initialCapitalizationEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><span class="cx"> @property (nonatomic, setter=_setApplePayEnabled:) BOOL _applePayEnabled WK_API_AVAILABLE(macosx(10.12), ios(10.0));
</span><ins>+@property (nonatomic, setter=_setShouldWaitForPaintAfterViewDidMoveToWindow:) BOOL _shouldWaitForPaintAfterViewDidMoveToWindow WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</ins><span class="cx">
</span><span class="cx"> #if TARGET_OS_IPHONE
</span><span class="cx"> @property (nonatomic, setter=_setAlwaysRunsAtForegroundPriority:) BOOL _alwaysRunsAtForegroundPriority WK_API_AVAILABLE(ios(9_0));
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (207291 => 207292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-13 17:25:24 UTC (rev 207291)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-13 17:44:27 UTC (rev 207292)
</span><span class="lines">@@ -357,6 +357,7 @@
</span><span class="cx"> , m_initialCapitalizationEnabled(m_configuration->initialCapitalizationEnabled())
</span><span class="cx"> , m_backForwardList(WebBackForwardList::create(*this))
</span><span class="cx"> , m_maintainsInactiveSelection(false)
</span><ins>+ , m_shouldWaitForPaintAfterViewDidMoveToWindow(m_configuration->shouldWaitForPaintAfterViewDidMoveToWindow())
</ins><span class="cx"> , m_isEditable(false)
</span><span class="cx"> , m_textZoomFactor(1)
</span><span class="cx"> , m_pageZoomFactor(1)
</span><span class="lines">@@ -1524,7 +1525,7 @@
</span><span class="cx">
</span><span class="cx"> bool isNowInWindow = (changed & ViewState::IsInWindow) && isInWindow();
</span><span class="cx"> // We always want to wait for the Web process to reply if we've been in-window before and are coming back in-window.
</span><del>- if (m_viewWasEverInWindow && isNowInWindow && m_drawingArea->hasVisibleContent())
</del><ins>+ if (m_viewWasEverInWindow && isNowInWindow && m_drawingArea->hasVisibleContent() && m_shouldWaitForPaintAfterViewDidMoveToWindow)
</ins><span class="cx"> m_viewStateChangeWantsSynchronousReply = true;
</span><span class="cx">
</span><span class="cx"> // Don't wait synchronously if the view state is not visible. (This matters in particular on iOS, where a hidden page may be suspended.)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (207291 => 207292)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-13 17:25:24 UTC (rev 207291)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-13 17:44:27 UTC (rev 207292)
</span><span class="lines">@@ -1653,6 +1653,8 @@
</span><span class="cx">
</span><span class="cx"> bool m_maintainsInactiveSelection;
</span><span class="cx">
</span><ins>+ bool m_shouldWaitForPaintAfterViewDidMoveToWindow;
+
</ins><span class="cx"> String m_toolTip;
</span><span class="cx">
</span><span class="cx"> EditorState m_editorState;
</span></span></pre>
</div>
</div>
</body>
</html>