<!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>[163989] 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/163989">163989</a></dd>
<dt>Author</dt> <dd>enrica@apple.com</dd>
<dt>Date</dt> <dd>2014-02-12 14:37:20 -0800 (Wed, 12 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>WK2: coordinate mapping for frames does not work when the page is scrolled.
https://bugs.webkit.org/show_bug.cgi?id=128690
<rdar://problem/16042925>
Reviewed by Simon Fraser.
We should not apply the scroll offset when using delegate scrolling.
* platform/ScrollView.cpp:
(WebCore::ScrollView::rootViewToContents):
(WebCore::ScrollView::contentsToRootView):
(WebCore::ScrollView::rootViewToTotalContents):</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163988 => 163989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-12 22:36:56 UTC (rev 163988)
+++ trunk/Source/WebCore/ChangeLog 2014-02-12 22:37:20 UTC (rev 163989)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-02-12 Enrica Casucci <enrica@apple.com>
+
+ WK2: coordinate mapping for frames does not work when the page is scrolled.
+ https://bugs.webkit.org/show_bug.cgi?id=128690
+ <rdar://problem/16042925>
+
+ Reviewed by Simon Fraser.
+
+ We should not apply the scroll offset when using delegate scrolling.
+
+ * platform/ScrollView.cpp:
+ (WebCore::ScrollView::rootViewToContents):
+ (WebCore::ScrollView::contentsToRootView):
+ (WebCore::ScrollView::rootViewToTotalContents):
+
</ins><span class="cx"> 2014-02-12 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: Rename PageInjectedScript* to WebInjectedScript*
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformScrollViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/ScrollView.cpp (163988 => 163989)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/ScrollView.cpp 2014-02-12 22:36:56 UTC (rev 163988)
+++ trunk/Source/WebCore/platform/ScrollView.cpp 2014-02-12 22:37:20 UTC (rev 163989)
</span><span class="lines">@@ -780,18 +780,27 @@
</span><span class="cx">
</span><span class="cx"> IntPoint ScrollView::rootViewToContents(const IntPoint& rootViewPoint) const
</span><span class="cx"> {
</span><ins>+ if (delegatesScrolling())
+ return convertFromRootView(rootViewPoint);
+
</ins><span class="cx"> IntPoint viewPoint = convertFromRootView(rootViewPoint);
</span><span class="cx"> return viewPoint + scrollOffsetRelativeToDocument();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntPoint ScrollView::contentsToRootView(const IntPoint& contentsPoint) const
</span><span class="cx"> {
</span><ins>+ if (delegatesScrolling())
+ return convertToRootView(contentsPoint);
+
</ins><span class="cx"> IntPoint viewPoint = contentsPoint + IntSize(0, headerHeight()) - scrollOffset();
</span><span class="cx"> return convertToRootView(viewPoint);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> IntRect ScrollView::rootViewToContents(const IntRect& rootViewRect) const
</span><span class="cx"> {
</span><ins>+ if (delegatesScrolling())
+ return convertFromRootView(rootViewRect);
+
</ins><span class="cx"> IntRect viewRect = convertFromRootView(rootViewRect);
</span><span class="cx"> viewRect.move(scrollOffsetRelativeToDocument());
</span><span class="cx"> return viewRect;
</span><span class="lines">@@ -799,6 +808,9 @@
</span><span class="cx">
</span><span class="cx"> IntRect ScrollView::contentsToRootView(const IntRect& contentsRect) const
</span><span class="cx"> {
</span><ins>+ if (delegatesScrolling())
+ return convertToRootView(contentsRect);
+
</ins><span class="cx"> IntRect viewRect = contentsRect;
</span><span class="cx"> viewRect.move(-scrollOffset() + IntSize(0, headerHeight()));
</span><span class="cx"> return convertToRootView(viewRect);
</span><span class="lines">@@ -806,6 +818,9 @@
</span><span class="cx">
</span><span class="cx"> IntPoint ScrollView::rootViewToTotalContents(const IntPoint& rootViewPoint) const
</span><span class="cx"> {
</span><ins>+ if (delegatesScrolling())
+ return convertFromRootView(rootViewPoint);
+
</ins><span class="cx"> IntPoint viewPoint = convertFromRootView(rootViewPoint);
</span><span class="cx"> return viewPoint + scrollOffset();
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>