<!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>[166343] 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/166343">166343</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-26 21:31:07 -0700 (Wed, 26 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] <rdar://problem/16265272> REGRESSION (WebKit2): Some pages appear blank until you scroll
https://bugs.webkit.org/show_bug.cgi?id=130819
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-03-26
Reviewed by Tim Horton.
When loading a new page, we never define the unobscured rect and exposed rect on the new frame.
As a result, there is nothing to render.
It uses to work thanks to dumb luck and a bug in Safari updating the visibleContentRects from
the UIProcess. Now that the bug is gone, "dumb luck" is not reliable enough to get the content rects :)
What this patch does is save if we have ever received new rects from the UI. If we have not, create them
based on the minimum layout size. This works because we know Safari shows the minimum layout size by default
and will tell us if it changes the obscured rects.
* WebProcess/WebPage/WebPage.cpp:
(WebKit::WebPage::WebPage):
(WebKit::WebPage::didCommitLoad):
* WebProcess/WebPage/WebPage.h:
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::viewportConfigurationChanged):
(WebKit::WebPage::updateVisibleContentRects):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagecpp">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPageh">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm">trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166342 => 166343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-27 04:16:32 UTC (rev 166342)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-27 04:31:07 UTC (rev 166343)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2014-03-26 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] <rdar://problem/16265272> REGRESSION (WebKit2): Some pages appear blank until you scroll
+ https://bugs.webkit.org/show_bug.cgi?id=130819
+
+ Reviewed by Tim Horton.
+
+ When loading a new page, we never define the unobscured rect and exposed rect on the new frame.
+ As a result, there is nothing to render.
+
+ It uses to work thanks to dumb luck and a bug in Safari updating the visibleContentRects from
+ the UIProcess. Now that the bug is gone, "dumb luck" is not reliable enough to get the content rects :)
+
+ What this patch does is save if we have ever received new rects from the UI. If we have not, create them
+ based on the minimum layout size. This works because we know Safari shows the minimum layout size by default
+ and will tell us if it changes the obscured rects.
+
+ * WebProcess/WebPage/WebPage.cpp:
+ (WebKit::WebPage::WebPage):
+ (WebKit::WebPage::didCommitLoad):
+ * WebProcess/WebPage/WebPage.h:
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::viewportConfigurationChanged):
+ (WebKit::WebPage::updateVisibleContentRects):
+
</ins><span class="cx"> 2014-03-26 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Add a _WKScriptWorld class
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp (166342 => 166343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-27 04:16:32 UTC (rev 166342)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.cpp 2014-03-27 04:31:07 UTC (rev 166343)
</span><span class="lines">@@ -285,6 +285,7 @@
</span><span class="cx"> #if PLATFORM(IOS)
</span><span class="cx"> , m_shouldReturnWordAtSelection(false)
</span><span class="cx"> , m_lastVisibleContentRectUpdateID(0)
</span><ins>+ , m_hasReceivedVisibleContentRectsAfterDidCommitLoad(false)
</ins><span class="cx"> , m_scaleWasSetByUIProcess(false)
</span><span class="cx"> , m_userHasChangedPageScaleFactor(false)
</span><span class="cx"> , m_viewportScreenSize(parameters.viewportScreenSize)
</span><span class="lines">@@ -4229,6 +4230,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> #if PLATFORM(IOS)
</span><ins>+ m_hasReceivedVisibleContentRectsAfterDidCommitLoad = false;
</ins><span class="cx"> m_userHasChangedPageScaleFactor = false;
</span><span class="cx">
</span><span class="cx"> Document* document = frame->coreFrame()->document();
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h (166342 => 166343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-27 04:16:32 UTC (rev 166342)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.h 2014-03-27 04:31:07 UTC (rev 166343)
</span><span class="lines">@@ -1133,6 +1133,7 @@
</span><span class="cx">
</span><span class="cx"> WebCore::ViewportConfiguration m_viewportConfiguration;
</span><span class="cx"> uint64_t m_lastVisibleContentRectUpdateID;
</span><ins>+ bool m_hasReceivedVisibleContentRectsAfterDidCommitLoad;
</ins><span class="cx"> bool m_scaleWasSetByUIProcess;
</span><span class="cx"> bool m_userHasChangedPageScaleFactor;
</span><span class="cx"> WebCore::FloatSize m_viewportScreenSize;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (166342 => 166343)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-27 04:16:32 UTC (rev 166342)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-03-27 04:31:07 UTC (rev 166343)
</span><span class="lines">@@ -1703,7 +1703,21 @@
</span><span class="cx"> else
</span><span class="cx"> scale = m_viewportConfiguration.initialScale();
</span><span class="cx">
</span><del>- scalePage(scale, m_page->mainFrame().view()->scrollPosition());
</del><ins>+ FrameView& frameView = *m_page->mainFrame().view();
+ IntPoint scrollPosition = frameView.scrollPosition();
+ if (!m_hasReceivedVisibleContentRectsAfterDidCommitLoad) {
+ IntSize minimumLayoutSizeInDocumentCoordinate = m_viewportConfiguration.minimumLayoutSize();
+ minimumLayoutSizeInDocumentCoordinate.scale(scale);
+
+ IntRect unobscuredContentRect(scrollPosition, minimumLayoutSizeInDocumentCoordinate);
+ frameView.setUnobscuredContentRect(unobscuredContentRect);
+ frameView.setScrollVelocity(0, 0, 0, monotonicallyIncreasingTime());
+
+ // FIXME: We could send down the obscured margins to find a better exposed rect and unobscured rect.
+ // It is not a big deal at the moment because the tile coverage will always extend past the obscured bottom inset.
+ m_drawingArea->setExposedContentRect(unobscuredContentRect);
+ }
+ scalePage(scale, scrollPosition);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WebPage::applicationWillResignActive()
</span><span class="lines">@@ -1723,6 +1737,7 @@
</span><span class="cx">
</span><span class="cx"> void WebPage::updateVisibleContentRects(const VisibleContentRectUpdateInfo& visibleContentRectUpdateInfo)
</span><span class="cx"> {
</span><ins>+ m_hasReceivedVisibleContentRectsAfterDidCommitLoad = true;
</ins><span class="cx"> m_lastVisibleContentRectUpdateID = visibleContentRectUpdateInfo.updateID();
</span><span class="cx">
</span><span class="cx"> FloatRect exposedRect = visibleContentRectUpdateInfo.exposedRect();
</span></span></pre>
</div>
</div>
</body>
</html>