<!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>[168880] 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/168880">168880</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-14 17:32:33 -0700 (Wed, 14 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] The top/bottom edges should not be sticky when restoring the scroll position from the dynamic size update history
https://bugs.webkit.org/show_bug.cgi?id=132931
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-05-14
Reviewed by Sam Weinig.
The goal of dynamicSizeUpdateHistory is to make dynamic resize completely reversible.
Because of the stick-to-edges heuristics, this was not true near the top and bottom edges.
For example, start in landscape, scroll the page a bit, then rotate to portrait. Now you have
a lot more vertical space, and the top edge of the document is at the edge of the scrollview.
Rotate back to landscape: the position is restored correct, but it is then overriden by
the stick-to-edges branch.
When we restore the position from history, we should only put it back in the valid bounds, skipping
stick-to-edges entirely.
* WebProcess/WebPage/ios/WebPageIOS.mm:
(WebKit::WebPage::dynamicViewportSizeUpdate):</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 (168879 => 168880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-05-15 00:27:17 UTC (rev 168879)
+++ trunk/Source/WebKit2/ChangeLog 2014-05-15 00:32:33 UTC (rev 168880)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2014-05-14 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] The top/bottom edges should not be sticky when restoring the scroll position from the dynamic size update history
+ https://bugs.webkit.org/show_bug.cgi?id=132931
+
+ Reviewed by Sam Weinig.
+
+ The goal of dynamicSizeUpdateHistory is to make dynamic resize completely reversible.
+ Because of the stick-to-edges heuristics, this was not true near the top and bottom edges.
+
+ For example, start in landscape, scroll the page a bit, then rotate to portrait. Now you have
+ a lot more vertical space, and the top edge of the document is at the edge of the scrollview.
+ Rotate back to landscape: the position is restored correct, but it is then overriden by
+ the stick-to-edges branch.
+
+ When we restore the position from history, we should only put it back in the valid bounds, skipping
+ stick-to-edges entirely.
+
+ * WebProcess/WebPage/ios/WebPageIOS.mm:
+ (WebKit::WebPage::dynamicViewportSizeUpdate):
+
</ins><span class="cx"> 2014-05-14 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable IOSurface view snapshots for 10.9+
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageiosWebPageIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm (168879 => 168880)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-15 00:27:17 UTC (rev 168879)
+++ trunk/Source/WebKit2/WebProcess/WebPage/ios/WebPageIOS.mm 2014-05-15 00:32:33 UTC (rev 168880)
</span><span class="lines">@@ -2002,12 +2002,14 @@
</span><span class="cx"> newUnobscuredContentRect.setWidth(std::min(static_cast<float>(newContentSize.width()), newUnobscuredContentRect.width()));
</span><span class="cx"> newUnobscuredContentRect.setHeight(std::min(static_cast<float>(newContentSize.height()), newUnobscuredContentRect.height()));
</span><span class="cx">
</span><ins>+ bool positionWasRestoredFromSizeUpdateHistory = false;
</ins><span class="cx"> const auto& previousPosition = m_dynamicSizeUpdateHistory.find(std::pair<IntSize, float>(newContentSize, scale));
</span><span class="cx"> if (previousPosition != m_dynamicSizeUpdateHistory.end()) {
</span><span class="cx"> IntPoint restoredPosition = previousPosition->value;
</span><span class="cx"> FloatPoint deltaPosition(restoredPosition.x() - newUnobscuredContentRect.x(), restoredPosition.y() - newUnobscuredContentRect.y());
</span><span class="cx"> newUnobscuredContentRect.moveBy(deltaPosition);
</span><span class="cx"> newExposedContentRect.moveBy(deltaPosition);
</span><ins>+ positionWasRestoredFromSizeUpdateHistory = true;
</ins><span class="cx"> } else if (oldContentSize != newContentSize) {
</span><span class="cx"> FloatPoint newRelativeContentCenter;
</span><span class="cx">
</span><span class="lines">@@ -2030,15 +2032,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Make the top/bottom edges "sticky" within 1 pixel.
</span><del>- if (targetUnobscuredRect.maxY() > oldContentSize.height() - 1) {
- float bottomVerticalPosition = newContentSize.height() - newUnobscuredContentRect.height();
- newUnobscuredContentRect.setY(bottomVerticalPosition);
- newExposedContentRect.setY(bottomVerticalPosition);
</del><ins>+ if (!positionWasRestoredFromSizeUpdateHistory) {
+ if (targetUnobscuredRect.maxY() > oldContentSize.height() - 1) {
+ float bottomVerticalPosition = newContentSize.height() - newUnobscuredContentRect.height();
+ newUnobscuredContentRect.setY(bottomVerticalPosition);
+ newExposedContentRect.setY(bottomVerticalPosition);
+ }
+ if (targetUnobscuredRect.y() < 1) {
+ newUnobscuredContentRect.setY(0);
+ newExposedContentRect.setY(0);
+ }
</ins><span class="cx"> }
</span><del>- if (targetUnobscuredRect.y() < 1) {
- newUnobscuredContentRect.setY(0);
- newExposedContentRect.setY(0);
- }
</del><span class="cx">
</span><span class="cx"> float horizontalAdjustment = 0;
</span><span class="cx"> if (newExposedContentRect.maxX() > newContentSize.width())
</span></span></pre>
</div>
</div>
</body>
</html>