<!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>[52012] trunk</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/52012">52012</a></dd>
<dt>Author</dt> <dd>bweinstein@apple.com</dd>
<dt>Date</dt> <dd>2009-12-11 11:59:11 -0800 (Fri, 11 Dec 2009)</dd>
</dl>

<h3>Log Message</h3>
<pre>Fixes &lt;http://webkit.org/b/32399&gt;.
Pan Scrolling Jumps out of frames if the initial location is in a frame that can't be scrolled.
        
Reviewed by Darin Adler.

WebCore: 

When we initially figure out the layer that we should begin scrolling, don't try to jump out
of frames/iFrames to look at the owner document. We don't want to jump out of frames, so we
don't need that logic anymore.
        
Added a test to make sure that we don't pan scroll if we start to scroll in an empty
iFrame that has a scrollable owner document.

Test: platform/win/fast/events/panScroll-no-iframe-jump.html

* dom/Node.cpp:
(WebCore::Node::defaultEventHandler):

LayoutTests: 

Added a test to make sure that we don't pan scroll if we start to scroll in an empty
iFrame that has a scrollable owner document.

* platform/win/fast/events/panScroll-no-iframe-jump-expected.txt: Added.
* platform/win/fast/events/panScroll-no-iframe-jump.html: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCoredomNodecpp">trunk/WebCore/dom/Node.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformwinfasteventspanScrollnoiframejumpexpectedtxt">trunk/LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformwinfasteventspanScrollnoiframejumphtml">trunk/LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (52011 => 52012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2009-12-11 19:45:59 UTC (rev 52011)
+++ trunk/LayoutTests/ChangeLog        2009-12-11 19:59:11 UTC (rev 52012)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2009-12-11  Brian Weinstein  &lt;bweinstein@apple.com&gt;
+
+        Reviewed by Darin Adler.
+
+        Fixes &lt;http://webkit.org/b/32399&gt;.
+        Pan Scrolling Jumps out of frames if the initial location is in a frame that can't be scrolled.
+        
+        Added a test to make sure that we don't pan scroll if we start to scroll in an empty
+        iFrame that has a scrollable owner document.
+
+        * platform/win/fast/events/panScroll-no-iframe-jump-expected.txt: Added.
+        * platform/win/fast/events/panScroll-no-iframe-jump.html: Added.
+
</ins><span class="cx"> 2009-12-11  Gustavo Noronha Silva  &lt;gustavo.noronha@collabora.co.uk&gt;
</span><span class="cx"> 
</span><span class="cx">         Skip test that is failing because script is not executed after the
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinfasteventspanScrollnoiframejumpexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump-expected.txt (0 => 52012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump-expected.txt        2009-12-11 19:59:11 UTC (rev 52012)
</span><span class="lines">@@ -0,0 +1,4 @@
</span><ins>+
+Test for bug 32399 This tests that pan scrolling doesn't jump out of an iFrame if the action begins in an iFrame that cannot scroll.
+
+Success! Div with overflow was not scrolled
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformwinfasteventspanScrollnoiframejumphtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump.html (0 => 52012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump.html                                (rev 0)
+++ trunk/LayoutTests/platform/win/fast/events/panScroll-no-iframe-jump.html        2009-12-11 19:59:11 UTC (rev 52012)
</span><span class="lines">@@ -0,0 +1,40 @@
</span><ins>+&lt;html&gt;
+    &lt;head&gt;
+        &lt;title&gt;Pan Scrolling Test&lt;/title&gt;
+    &lt;/head&gt;
+    &lt;body&gt;
+        &lt;script&gt;
+            if (window.layoutTestController) {
+                layoutTestController.dumpAsText();
+                layoutTestController.waitUntilDone();
+            }
+        &lt;/script&gt;
+        &lt;div id=&quot;overflow&quot; style=&quot;width:500px; height:150px; overflow:auto; border:2px solid red; padding:10px&quot;&gt;
+            &lt;iframe width=&quot;100px&quot; height=&quot;100px&quot;&gt;&lt;/iframe&gt;
+            &lt;h1&gt;Test for &lt;a href=&quot;https://bugs.webkit.org/show_bug.cgi?id=32399&quot;&gt;bug 32399&lt;/a&gt; This tests that pan
+            scrolling doesn't jump out of an iFrame if the action begins in an iFrame that cannot scroll.&lt;/h1&gt;
+        &lt;/div&gt;
+        &lt;p&gt;
+        &lt;div id=&quot;console&quot;&gt;&lt;/div&gt;
+        &lt;script&gt;
+            if (window.eventSender)
+            {
+                eventSender.mouseMoveTo(50, 50);
+                eventSender.mouseDown(1);
+                eventSender.mouseUp(1);
+                eventSender.mouseMoveTo(50, 200);
+                setTimeout(finished, 500);
+            }
+            
+            function finished()
+            {
+                if (!document.getElementById('overflow').scrollTop)
+                    document.getElementById('console').innerHTML = &quot;Success! Div with overflow was not scrolled&quot;;
+                else
+                    document.getElementById('console').innerHTML = &quot;Fail! Div with overflow was scrolled&quot;;
+                
+                window.layoutTestController.notifyDone();
+            }
+        &lt;/script&gt;
+    &lt;/body&gt;
+&lt;/html&gt;
</ins></span></pre></div>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (52011 => 52012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2009-12-11 19:45:59 UTC (rev 52011)
+++ trunk/WebCore/ChangeLog        2009-12-11 19:59:11 UTC (rev 52012)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2009-12-11  Brian Weinstein  &lt;bweinstein@apple.com&gt;
</span><span class="cx"> 
</span><ins>+        Reviewed by Darin Adler.
+
+        Fixes &lt;http://webkit.org/b/32399&gt;.
+        Pan Scrolling Jumps out of frames if the initial location is in a frame that can't be scrolled.
+        
+        When we initially figure out the layer that we should begin scrolling, don't try to jump out
+        of frames/iFrames to look at the owner document. We don't want to jump out of frames, so we
+        don't need that logic anymore.
+        
+        Added a test to make sure that we don't pan scroll if we start to scroll in an empty
+        iFrame that has a scrollable owner document.
+
+        Test: platform/win/fast/events/panScroll-no-iframe-jump.html
+
+        * dom/Node.cpp:
+        (WebCore::Node::defaultEventHandler):
+
+2009-12-11  Brian Weinstein  &lt;bweinstein@apple.com&gt;
+
</ins><span class="cx">         Reviewed by Adam Roben.
</span><span class="cx"> 
</span><span class="cx">         Fixes &lt;http://webkit.org/b/32303&gt;.
</span></span></pre></div>
<a id="trunkWebCoredomNodecpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/dom/Node.cpp (52011 => 52012)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/dom/Node.cpp        2009-12-11 19:45:59 UTC (rev 52011)
+++ trunk/WebCore/dom/Node.cpp        2009-12-11 19:59:11 UTC (rev 52012)
</span><span class="lines">@@ -2833,17 +2833,11 @@
</span><span class="cx">         if (mouseEvent-&gt;button() == MiddleButton &amp;&amp; !this-&gt;isLink()) {
</span><span class="cx">             RenderObject* renderer = this-&gt;renderer();
</span><span class="cx"> 
</span><del>-            while (renderer &amp;&amp; (!renderer-&gt;isBox() || !toRenderBox(renderer)-&gt;canBeScrolledAndHasScrollableArea())) {
-                // FIXME: If we start in a frame that can't scroll, we don't want to jump out of it to start scrolling:
-                // &lt;https://bugs.webkit.org/show_bug.cgi?id=32399&gt;.
-                if (!renderer-&gt;parent() &amp;&amp; renderer-&gt;node() == renderer-&gt;document() &amp;&amp; renderer-&gt;document()-&gt;ownerElement())
-                    renderer = renderer-&gt;document()-&gt;ownerElement()-&gt;renderer();
-                else
-                    renderer = renderer-&gt;parent();
-            }
</del><ins>+            while (renderer &amp;&amp; (!renderer-&gt;isBox() || !toRenderBox(renderer)-&gt;canBeScrolledAndHasScrollableArea()))
+                renderer = renderer-&gt;parent();
</ins><span class="cx"> 
</span><span class="cx">             if (renderer) {
</span><del>-                if (Frame* frame = renderer-&gt;document()-&gt;frame())
</del><ins>+                if (Frame* frame = document()-&gt;frame())
</ins><span class="cx">                     frame-&gt;eventHandler()-&gt;startPanScrolling(renderer);
</span><span class="cx">             }
</span><span class="cx">         }
</span></span></pre>
</div>
</div>

</body>
</html>