<!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>[203145] 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/203145">203145</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2016-07-12 17:55:47 -0700 (Tue, 12 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS WK2] After zooming and when under memory pressure, page tiles sometimes don't redraw while panning
https://bugs.webkit.org/show_bug.cgi?id=159697
rdar://problem/26314075
Reviewed by Benjamin Poulain.
When under memory pressure, and after pinching back to minimum scale, WebPage::updateVisibleContentRects()
would sometimes always bail under the "boundedScale != currentScale..." condition.
This happened because the visibleContentRectUpdateInfo.scale() is a double, but m_page->pageScaleFactor()
is a float, and the constraining between min and max scale (which are doubles) caused boundedScale
to be always different from currentScale.
Fix by using floats throughout.
No test because there's no way to simulate memory pressure for testing.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::updateVisibleContentRects):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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 (203144 => 203145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-07-13 00:45:11 UTC (rev 203144)
+++ trunk/Source/WebKit2/ChangeLog 2016-07-13 00:55:47 UTC (rev 203145)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2016-07-12 Simon Fraser <simon.fraser@apple.com>
+
+ [iOS WK2] After zooming and when under memory pressure, page tiles sometimes don't redraw while panning
+ https://bugs.webkit.org/show_bug.cgi?id=159697
+ rdar://problem/26314075
+
+ Reviewed by Benjamin Poulain.
+
+ When under memory pressure, and after pinching back to minimum scale, WebPage::updateVisibleContentRects()
+ would sometimes always bail under the "boundedScale != currentScale..." condition.
+
+ This happened because the visibleContentRectUpdateInfo.scale() is a double, but m_page->pageScaleFactor()
+ is a float, and the constraining between min and max scale (which are doubles) caused boundedScale
+ to be always different from currentScale.
+
+ Fix by using floats throughout.
+
+ No test because there's no way to simulate memory pressure for testing.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::updateVisibleContentRects):
+
</ins><span class="cx"> 2016-07-12 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> [WK2][NetworkSession] Fix unsafe RunLoop::dispatch() in NetworkLoad constructor
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (203144 => 203145)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-07-13 00:45:11 UTC (rev 203144)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2016-07-13 00:55:47 UTC (rev 203145)
</span><span class="lines">@@ -3020,15 +3020,16 @@
</span><span class="cx"> m_isInStableState = visibleContentRectUpdateInfo.inStableState();
</span><span class="cx">
</span><span class="cx"> double scaleNoiseThreshold = 0.005;
</span><del>- double filteredScale = visibleContentRectUpdateInfo.scale();
- double currentScale = m_page->pageScaleFactor();
- if (!m_isInStableState && fabs(filteredScale - m_page->pageScaleFactor()) < scaleNoiseThreshold) {
</del><ins>+ float filteredScale = visibleContentRectUpdateInfo.scale();
+ float currentScale = m_page->pageScaleFactor();
+
+ if (!m_isInStableState && fabs(filteredScale - currentScale) < scaleNoiseThreshold) {
</ins><span class="cx"> // Tiny changes of scale during interactive zoom cause content to jump by one pixel, creating
</span><span class="cx"> // visual noise. We filter those useless updates.
</span><span class="cx"> filteredScale = currentScale;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- double boundedScale = std::min(m_viewportConfiguration.maximumScale(), std::max(m_viewportConfiguration.minimumScale(), filteredScale));
</del><ins>+ float boundedScale = std::min<float>(m_viewportConfiguration.maximumScale(), std::max<float>(m_viewportConfiguration.minimumScale(), filteredScale));
</ins><span class="cx">
</span><span class="cx"> // Skip progressively redrawing tiles if pinch-zooming while the system is under memory pressure.
</span><span class="cx"> if (boundedScale != currentScale && !m_isInStableState && MemoryPressureHandler::singleton().isUnderMemoryPressure())
</span><span class="lines">@@ -3047,21 +3048,20 @@
</span><span class="cx">
</span><span class="cx"> IntPoint scrollPosition = roundedIntPoint(visibleContentRectUpdateInfo.unobscuredContentRect().location());
</span><span class="cx">
</span><del>- float floatBoundedScale = boundedScale;
</del><span class="cx"> bool hasSetPageScale = false;
</span><del>- if (floatBoundedScale != currentScale) {
</del><ins>+ if (boundedScale != currentScale) {
</ins><span class="cx"> m_scaleWasSetByUIProcess = true;
</span><span class="cx"> m_hasStablePageScaleFactor = m_isInStableState;
</span><span class="cx">
</span><span class="cx"> m_dynamicSizeUpdateHistory.clear();
</span><span class="cx">
</span><del>- m_page->setPageScaleFactor(floatBoundedScale, scrollPosition, m_isInStableState);
</del><ins>+ m_page->setPageScaleFactor(boundedScale, scrollPosition, m_isInStableState);
</ins><span class="cx"> hasSetPageScale = true;
</span><del>- send(Messages::WebPageProxy::PageScaleFactorDidChange(floatBoundedScale));
</del><ins>+ send(Messages::WebPageProxy::PageScaleFactorDidChange(boundedScale));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!hasSetPageScale && m_isInStableState) {
</span><del>- m_page->setPageScaleFactor(floatBoundedScale, scrollPosition, true);
</del><ins>+ m_page->setPageScaleFactor(boundedScale, scrollPosition, true);
</ins><span class="cx"> hasSetPageScale = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>