<!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>[165288] trunk/Source/WebCore</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/165288">165288</a></dd>
<dt>Author</dt> <dd>benjamin@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-07 13:56:18 -0800 (Fri, 07 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[iOS] WebKit1 scroll position is incorrect
https://bugs.webkit.org/show_bug.cgi?id=129905
Patch by Benjamin Poulain <bpoulain@apple.com> on 2014-03-07
Reviewed by Simon Fraser.
* page/DOMWindow.cpp:
(WebCore::DOMWindow::scrollX):
(WebCore::DOMWindow::scrollY):
A new optimization was avoiding layout if the position is zero. This was using the scrollX/Y instead
of actualScrollX/Y which caused us to always bail out instead of returning the value to JavaScript.
* platform/ScrollView.h:
(WebCore::ScrollView::actualScrollX):
(WebCore::ScrollView::actualScrollY):
(WebCore::ScrollView::actualScrollPosition):
This was accidentally changed to the iOS compat document visible rect at some point.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageDOMWindowcpp">trunk/Source/WebCore/page/DOMWindow.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformScrollViewh">trunk/Source/WebCore/platform/ScrollView.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165287 => 165288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-07 21:53:19 UTC (rev 165287)
+++ trunk/Source/WebCore/ChangeLog 2014-03-07 21:56:18 UTC (rev 165288)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2014-03-07 Benjamin Poulain <bpoulain@apple.com>
+
+ [iOS] WebKit1 scroll position is incorrect
+ https://bugs.webkit.org/show_bug.cgi?id=129905
+
+ Reviewed by Simon Fraser.
+
+ * page/DOMWindow.cpp:
+ (WebCore::DOMWindow::scrollX):
+ (WebCore::DOMWindow::scrollY):
+ A new optimization was avoiding layout if the position is zero. This was using the scrollX/Y instead
+ of actualScrollX/Y which caused us to always bail out instead of returning the value to JavaScript.
+
+ * platform/ScrollView.h:
+ (WebCore::ScrollView::actualScrollX):
+ (WebCore::ScrollView::actualScrollY):
+ (WebCore::ScrollView::actualScrollPosition):
+ This was accidentally changed to the iOS compat document visible rect at some point.
+
</ins><span class="cx"> 2014-03-07 Adenilson Cavalcanti <cavalcantii@gmail.com>
</span><span class="cx">
</span><span class="cx"> Remove unused StdDeviation from Drop shadow effect
</span></span></pre></div>
<a id="trunkSourceWebCorepageDOMWindowcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DOMWindow.cpp (165287 => 165288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DOMWindow.cpp 2014-03-07 21:53:19 UTC (rev 165287)
+++ trunk/Source/WebCore/page/DOMWindow.cpp 2014-03-07 21:56:18 UTC (rev 165288)
</span><span class="lines">@@ -1192,16 +1192,18 @@
</span><span class="cx"> if (!view)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (!view->scrollX())
</del><ins>+ int scrollX;
+#if PLATFORM(IOS)
+ scrollX = view->actualScrollX();
+#else
+ scrollX = view->scrollX();
+#endif
+ if (!scrollX)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> m_frame->document()->updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- return static_cast<int>(view->actualScrollX() / (m_frame->pageZoomFactor() * m_frame->frameScaleFactor()));
-#else
- return view->mapFromLayoutToCSSUnits(view->scrollX());
-#endif
</del><ins>+ return view->mapFromLayoutToCSSUnits(scrollX);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> int DOMWindow::scrollY() const
</span><span class="lines">@@ -1213,16 +1215,18 @@
</span><span class="cx"> if (!view)
</span><span class="cx"> return 0;
</span><span class="cx">
</span><del>- if (!view->scrollY())
</del><ins>+ int scrollY;
+#if PLATFORM(IOS)
+ scrollY = view->actualScrollY();
+#else
+ scrollY = view->scrollY();
+#endif
+ if (!scrollY)
</ins><span class="cx"> return 0;
</span><span class="cx">
</span><span class="cx"> m_frame->document()->updateLayoutIgnorePendingStylesheets();
</span><span class="cx">
</span><del>-#if PLATFORM(IOS)
- return static_cast<int>(view->actualScrollY() / (m_frame->pageZoomFactor() * m_frame->frameScaleFactor()));
-#else
- return view->mapFromLayoutToCSSUnits(view->scrollY());
-#endif
</del><ins>+ return view->mapFromLayoutToCSSUnits(scrollY);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool DOMWindow::closed() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.h (165287 => 165288)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.h 2014-03-07 21:53:19 UTC (rev 165287)
+++ trunk/Source/WebCore/platform/ScrollView.h 2014-03-07 21:56:18 UTC (rev 165288)
</span><span class="lines">@@ -212,10 +212,10 @@
</span><span class="cx"> int scrollY() const { return scrollPosition().y(); }
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(IOS)
</span><del>- int actualScrollX() const { return visibleContentRect().x(); }
- int actualScrollY() const { return visibleContentRect().y(); }
</del><ins>+ int actualScrollX() const { return unobscuredContentRect().x(); }
+ int actualScrollY() const { return unobscuredContentRect().y(); }
</ins><span class="cx"> // FIXME: maybe fix scrollPosition() on iOS to return the actual scroll position.
</span><del>- IntPoint actualScrollPosition() const { return visibleContentRect().location(); }
</del><ins>+ IntPoint actualScrollPosition() const { return unobscuredContentRect().location(); }
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> // scrollOffset() anchors its (0,0) point at the top end of the header if this ScrollableArea
</span></span></pre>
</div>
</div>
</body>
</html>