<!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>[184797] 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/184797">184797</a></dd>
<dt>Author</dt> <dd>timothy_horton@apple.com</dd>
<dt>Date</dt> <dd>2015-05-22 14:48:53 -0700 (Fri, 22 May 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Avoid doing an extra layout in some cases while doing scale-to-fit
https://bugs.webkit.org/show_bug.cgi?id=145321
<rdar://problem/21051165>
Reviewed by Beth Dakin.
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
* WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
(WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded):
If we make it to scaleViewToFitDocumentIfNeeded with valid layout,
the view width is still less than the last-known minimum document size,
and the document size hasn't changed, update the view scale without
doing an extra layout, keeping the fixed layout size at the previously
computed minimum document size.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm">trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (184796 => 184797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-05-22 21:43:14 UTC (rev 184796)
+++ trunk/Source/WebKit2/ChangeLog 2015-05-22 21:48:53 UTC (rev 184797)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-05-22 Tim Horton <timothy_horton@apple.com>
+
+ Avoid doing an extra layout in some cases while doing scale-to-fit
+ https://bugs.webkit.org/show_bug.cgi?id=145321
+ <rdar://problem/21051165>
+
+ Reviewed by Beth Dakin.
+
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h:
+ * WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm:
+ (WebKit::TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded):
+ If we make it to scaleViewToFitDocumentIfNeeded with valid layout,
+ the view width is still less than the last-known minimum document size,
+ and the document size hasn't changed, update the view scale without
+ doing an extra layout, keeping the fixed layout size at the previously
+ computed minimum document size.
+
</ins><span class="cx"> 2015-05-22 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Yellow highlight and DD popover don't go away when scrolling an iframe
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h (184796 => 184797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-05-22 21:43:14 UTC (rev 184796)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.h 2015-05-22 21:48:53 UTC (rev 184797)
</span><span class="lines">@@ -154,7 +154,7 @@
</span><span class="cx">
</span><span class="cx"> Vector<uint64_t> m_fenceCallbacksForAfterNextFlush;
</span><span class="cx"> bool m_shouldScaleViewToFitDocument { false };
</span><del>-
</del><ins>+ bool m_isScalingViewToFitDocument { false };
</ins><span class="cx"> WebCore::IntSize m_lastViewSizeForScaleToFit;
</span><span class="cx"> WebCore::IntSize m_lastDocumentSizeForScaleToFit;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPagemacTiledCoreAnimationDrawingAreamm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm (184796 => 184797)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-05-22 21:43:14 UTC (rev 184796)
+++ trunk/Source/WebKit2/WebProcess/WebPage/mac/TiledCoreAnimationDrawingArea.mm 2015-05-22 21:48:53 UTC (rev 184797)
</span><span class="lines">@@ -272,17 +272,33 @@
</span><span class="cx">
</span><span class="cx"> void TiledCoreAnimationDrawingArea::scaleViewToFitDocumentIfNeeded()
</span><span class="cx"> {
</span><del>- // FIXME: Defer scrollbar flashing until after the second layout.
-
</del><span class="cx"> const int maximumDocumentWidthForScaling = 1440;
</span><span class="cx"> const float minimumViewScale = 0.1;
</span><span class="cx">
</span><span class="cx"> if (!m_shouldScaleViewToFitDocument)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (!m_webPage.mainFrame()->view()->needsLayout() && m_lastDocumentSizeForScaleToFit == m_webPage.mainFrameView()->renderView()->unscaledDocumentRect().size() && m_lastViewSizeForScaleToFit == m_webPage.size())
</del><ins>+ int viewWidth = m_webPage.size().width();
+ bool documentWidthChangedOrInvalidated = m_webPage.mainFrame()->view()->needsLayout() || (m_lastDocumentSizeForScaleToFit.width() != m_webPage.mainFrameView()->renderView()->unscaledDocumentRect().width());
+ bool viewWidthChanged = m_lastViewSizeForScaleToFit.width() != viewWidth;
+
+ if (!documentWidthChangedOrInvalidated && !viewWidthChanged)
</ins><span class="cx"> return;
</span><span class="cx">
</span><ins>+ // The view is now bigger than the document, so we'll re-evaluate whether we have to scale.
+ if (m_isScalingViewToFitDocument && viewWidth >= m_lastDocumentSizeForScaleToFit.width())
+ m_isScalingViewToFitDocument = false;
+
+ // Our current understanding of the document width is still up to date, and we're in scaling mode.
+ // Update the viewScale without doing an extra layout to re-determine the document width.
+ if (m_isScalingViewToFitDocument && !documentWidthChangedOrInvalidated) {
+ float viewScale = (float)viewWidth / (float)m_lastDocumentSizeForScaleToFit.width();
+ m_lastViewSizeForScaleToFit = m_webPage.size();
+ viewScale = std::max(viewScale, minimumViewScale);
+ m_webPage.scaleView(viewScale);
+ return;
+ }
+
</ins><span class="cx"> // Lay out at the view size.
</span><span class="cx"> m_webPage.setUseFixedLayout(false);
</span><span class="cx"> m_webPage.layoutIfNeeded();
</span><span class="lines">@@ -292,7 +308,6 @@
</span><span class="cx"> m_lastDocumentSizeForScaleToFit = documentSize;
</span><span class="cx">
</span><span class="cx"> int documentWidth = documentSize.width();
</span><del>- int viewWidth = m_webPage.size().width();
</del><span class="cx">
</span><span class="cx"> float viewScale = 1;
</span><span class="cx">
</span><span class="lines">@@ -300,6 +315,7 @@
</span><span class="cx"> // sites that want horizontal scrollbars to continue to have them.
</span><span class="cx"> if (documentWidth && documentWidth < maximumDocumentWidthForScaling && viewWidth < documentWidth) {
</span><span class="cx"> // If the document doesn't fit in the view, scale it down but lay out at the view size.
</span><ins>+ m_isScalingViewToFitDocument = true;
</ins><span class="cx"> m_webPage.setUseFixedLayout(true);
</span><span class="cx"> viewScale = (float)viewWidth / (float)documentWidth;
</span><span class="cx"> viewScale = std::max(viewScale, minimumViewScale);
</span></span></pre>
</div>
</div>
</body>
</html>