<!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>[167411] trunk/Source</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/167411">167411</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-04-16 20:26:53 -0700 (Wed, 16 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS][WK2] Fix annoying scrolling bugs
https://bugs.webkit.org/show_bug.cgi?id=131722
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-04-16
Reviewed by Simon Fraser.
Source/WebCore:
* platform/ScrollView.cpp:
(WebCore::ScrollView::updateScrollbars):
Since ScrollingStateScrollingNode::setRequestedScrollPosition() was added, we see ScrollView::updateScrollbars()
keep changing the scroll position to incorrect values.
On iOS, the scrollbars are handled by the native UI, the code just compute incorrect scroll position. On WebKit1,
the code does not run because there is a platformWidget().
Just #ifdef the whole useless code.
Source/WebKit2:
* UIProcess/API/Cocoa/WKWebView.mm:
(-[WKWebView _scrollToContentOffset:WebCore::]):
We are scrolling at the wrong position when we have the "small obscured insets".</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewcpp">trunk/Source/WebCore/platform/ScrollView.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (167410 => 167411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-04-17 01:40:04 UTC (rev 167410)
+++ trunk/Source/WebCore/ChangeLog 2014-04-17 03:26:53 UTC (rev 167411)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-04-16 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Fix annoying scrolling bugs
+ https://bugs.webkit.org/show_bug.cgi?id=131722
+
+ Reviewed by Simon Fraser.
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::updateScrollbars):
+ Since ScrollingStateScrollingNode::setRequestedScrollPosition() was added, we see ScrollView::updateScrollbars()
+ keep changing the scroll position to incorrect values.
+
+ On iOS, the scrollbars are handled by the native UI, the code just compute incorrect scroll position. On WebKit1,
+ the code does not run because there is a platformWidget().
+
+ Just #ifdef the whole useless code.
+
</ins><span class="cx"> 2014-04-16 Alexandru Chiculita <achicu@adobe.com>
</span><span class="cx">
</span><span class="cx"> Improve performance of the RenderLayerCompositor::OverlapMap
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (167410 => 167411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2014-04-17 01:40:04 UTC (rev 167410)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2014-04-17 03:26:53 UTC (rev 167411)
</span><span class="lines">@@ -537,11 +537,9 @@
</span><span class="cx"> updateScrollbars(scrollOffset());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static const unsigned cMaxUpdateScrollbarsPass = 2;
-
</del><span class="cx"> void ScrollView::updateScrollbars(const IntSize& desiredOffset)
</span><span class="cx"> {
</span><del>- if (m_inUpdateScrollbars || prohibitsScrolling() || platformWidget())
</del><ins>+ if (m_inUpdateScrollbars || prohibitsScrolling() || platformWidget() || delegatesScrolling())
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> bool hasOverlayScrollbars = (!m_horizontalScrollbar || m_horizontalScrollbar->isOverlayScrollbar()) && (!m_verticalScrollbar || m_verticalScrollbar->isOverlayScrollbar());
</span><span class="lines">@@ -640,6 +638,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ const unsigned cMaxUpdateScrollbarsPass = 2;
</ins><span class="cx"> if ((sendContentResizedNotification || needAnotherPass) && m_updateScrollbarsPass < cMaxUpdateScrollbarsPass) {
</span><span class="cx"> m_updateScrollbarsPass++;
</span><span class="cx"> contentsResized();
</span><span class="lines">@@ -732,6 +731,7 @@
</span><span class="cx"> m_verticalScrollbar->offsetDidChange();
</span><span class="cx">
</span><span class="cx"> m_inUpdateScrollbars = false;
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> const int panIconSizeLength = 16;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (167410 => 167411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-17 01:40:04 UTC (rev 167410)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-17 03:26:53 UTC (rev 167411)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-04-16 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS][WK2] Fix annoying scrolling bugs
+ https://bugs.webkit.org/show_bug.cgi?id=131722
+
+ Reviewed by Simon Fraser.
+
+ * UIProcess/API/Cocoa/WKWebView.mm:
+ (-[WKWebView _scrollToContentOffset:WebCore::]):
+ We are scrolling at the wrong position when we have the "small obscured insets".
+
</ins><span class="cx"> 2014-04-16 Gavin Barraclough <baraclough@apple.com>
</span><span class="cx">
</span><span class="cx"> On iOS keep network process running using a process assertion rather than a boost
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm (167410 => 167411)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-17 01:40:04 UTC (rev 167410)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm 2014-04-17 03:26:53 UTC (rev 167411)
</span><span class="lines">@@ -556,10 +556,7 @@
</span><span class="cx"> CGFloat zoomScale = contentZoomScale(self);
</span><span class="cx"> scaledOffset.scale(zoomScale, zoomScale);
</span><span class="cx">
</span><del>- // FIXME: the offset is relative to the unobscured rect top, not the content insets!
- UIEdgeInsets inset = [_scrollView contentInset];
- scaledOffset += WebCore::FloatSize(-inset.left, -inset.top);
-
</del><ins>+ scaledOffset -= WebCore::FloatSize(_obscuredInsets.left, _obscuredInsets.top);
</ins><span class="cx"> [_scrollView setContentOffset:scaledOffset];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>