<!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>[35933] trunk/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/35933">35933</a></dd>
<dt>Author</dt> <dd>britto@apple.com</dd>
<dt>Date</dt> <dd>2008-08-26 10:51:03 -0700 (Tue, 26 Aug 2008)</dd>
</dl>

<h3>Log Message</h3>
<pre>2008-08-26  Maxime Britto  &lt;britto@apple.com&gt;

        Reviewed by Adele.

        &lt;rdar://6159244&gt; Pan-scrolling does not work on particular sites (starmagazine.com, nytimes.com)
        This patch fixes the issues and modify the behavior of the panscroll by allowing it to jump to a parent layer when it reaches the end of its scrollable area.
        This is matching the behavior of the mouse wheel when trying to scroll in a smaller layer of the page (div, textarea, ...) and when we reach the edge and keep scrolling then the whole page scrolls.

        * page/EventHandler.cpp:
        (WebCore::EventHandler::updateAutoscrollRenderer): if we switch to the parent layer to do the scroll we want to change the renderer for the panning
        * page/EventHandler.h:
        * rendering/RenderLayer.cpp:
        (WebCore::RenderLayer::panScrollFromPoint): now calls the scrollByRecursively method when it has computed the xDelta and yDelta
        (WebCore::RenderLayer::scrollByRecursively): try to scroll the current layer by the xDelta and yDelta provided, if it can't it ask its parent layer to do so.
        * rendering/RenderLayer.h:
        * rendering/RenderObject.cpp:
        (WebCore::RenderObject::canBeProgramaticallyScrolled): a RenderObject must have a RenderLayer to be programatically scrolled
        (WebCore::RenderObject::autoscroll): No need to check for the layer anymore since we verify it's present in the upmentionned method
        (WebCore::RenderObject::panScroll): No need to check for the layer anymore too.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkWebCoreChangeLog">trunk/WebCore/ChangeLog</a></li>
<li><a href="#trunkWebCorepageEventHandlercpp">trunk/WebCore/page/EventHandler.cpp</a></li>
<li><a href="#trunkWebCorepageEventHandlerh">trunk/WebCore/page/EventHandler.h</a></li>
<li><a href="#trunkWebCorerenderingRenderLayercpp">trunk/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkWebCorerenderingRenderLayerh">trunk/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkWebCorerenderingRenderObjectcpp">trunk/WebCore/rendering/RenderObject.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/ChangeLog (35932 => 35933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/ChangeLog        2008-08-26 16:07:16 UTC (rev 35932)
+++ trunk/WebCore/ChangeLog        2008-08-26 17:51:03 UTC (rev 35933)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2008-08-26  Maxime Britto  &lt;britto@apple.com&gt;
+
+        Reviewed by Adele.
+
+        &lt;rdar://6159244&gt; Pan-scrolling does not work on particular sites (starmagazine.com, nytimes.com)
+        This patch fixes the issues and modify the behavior of the panscroll by allowing it to jump to a parent layer when it reaches the end of its scrollable area.
+        This is matching the behavior of the mouse wheel when trying to scroll in a smaller layer of the page (div, textarea, ...) and when we reach the edge and keep scrolling then the whole page scrolls.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::updateAutoscrollRenderer): if we switch to the parent layer to do the scroll we want to change the renderer for the panning
+        * page/EventHandler.h:
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::panScrollFromPoint): now calls the scrollByRecursively method when it has computed the xDelta and yDelta
+        (WebCore::RenderLayer::scrollByRecursively): try to scroll the current layer by the xDelta and yDelta provided, if it can't it ask its parent layer to do so.
+        * rendering/RenderLayer.h:
+        * rendering/RenderObject.cpp:
+        (WebCore::RenderObject::canBeProgramaticallyScrolled): a RenderObject must have a RenderLayer to be programatically scrolled
+        (WebCore::RenderObject::autoscroll): No need to check for the layer anymore since we verify it's present in the upmentionned method
+        (WebCore::RenderObject::panScroll): No need to check for the layer anymore too.
+
</ins><span class="cx"> 2008-08-25  Julien Chaffraix  &lt;jchaffraix@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         Reviewed by Darin.
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.cpp (35932 => 35933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.cpp        2008-08-26 16:07:16 UTC (rev 35932)
+++ trunk/WebCore/page/EventHandler.cpp        2008-08-26 17:51:03 UTC (rev 35933)
</span><span class="lines">@@ -646,6 +646,20 @@
</span><span class="cx">     return m_autoscrollRenderer;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void EventHandler::updateAutoscrollRenderer()
+{
+    if (!m_autoscrollRenderer)
+        return;
+
+    HitTestResult hitTest = hitTestResultAtPoint(m_panScrollStartPos, true);
+
+    if (Node* nodeAtPoint = hitTest.innerNode())
+        m_autoscrollRenderer = nodeAtPoint-&gt;renderer();
+
+    while (m_autoscrollRenderer &amp;&amp; !m_autoscrollRenderer-&gt;canBeProgramaticallyScrolled(false))
+        m_autoscrollRenderer = m_autoscrollRenderer-&gt;parent();
+}
+
</ins><span class="cx"> void EventHandler::setAutoscrollRenderer(RenderObject* renderer)
</span><span class="cx"> {
</span><span class="cx">     m_autoscrollRenderer = renderer;
</span></span></pre></div>
<a id="trunkWebCorepageEventHandlerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/page/EventHandler.h (35932 => 35933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/page/EventHandler.h        2008-08-26 16:07:16 UTC (rev 35932)
+++ trunk/WebCore/page/EventHandler.h        2008-08-26 17:51:03 UTC (rev 35933)
</span><span class="lines">@@ -94,6 +94,7 @@
</span><span class="cx"> 
</span><span class="cx">     void stopAutoscrollTimer(bool rendererIsBeingDestroyed = false);
</span><span class="cx">     RenderObject* autoscrollRenderer() const;
</span><ins>+    void updateAutoscrollRenderer();
</ins><span class="cx"> 
</span><span class="cx">     HitTestResult hitTestResultAtPoint(const IntPoint&amp;, bool allowShadowContent);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderLayer.cpp (35932 => 35933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderLayer.cpp        2008-08-26 16:07:16 UTC (rev 35932)
+++ trunk/WebCore/rendering/RenderLayer.cpp        2008-08-26 17:51:03 UTC (rev 35933)
</span><span class="lines">@@ -724,18 +724,34 @@
</span><span class="cx">     if (abs(yDelta) &lt; shortDistanceLimit)
</span><span class="cx">         yDelta /= speedReducer;
</span><span class="cx"> 
</span><ins>+    scrollByRecursively(xDelta, yDelta);
+}
+
+void RenderLayer::scrollByRecursively(int xDelta, int yDelta)
+{
</ins><span class="cx">     bool restrictedByLineClamp = false;
</span><span class="cx">     if (m_object-&gt;parent())
</span><span class="cx">         restrictedByLineClamp = m_object-&gt;parent()-&gt;style()-&gt;lineClamp() &gt;= 0;
</span><span class="cx"> 
</span><span class="cx">     if (m_object-&gt;hasOverflowClip() &amp;&amp; !restrictedByLineClamp) {
</span><del>-        int newOffsetX = max(0, scrollXOffset() + xDelta);
-        int newOffsetY = max(0, scrollYOffset() + yDelta);
-        scrollToOffset(newOffsetX, newOffsetY); 
</del><ins>+        int newOffsetX = scrollXOffset() + xDelta;
+        int newOffsetY = scrollYOffset() + yDelta;
+        scrollToOffset(newOffsetX, newOffsetY);
+
+        // If this layer can't do the scroll we ask its parent
+        int leftToScrollX = newOffsetX - scrollXOffset();
+        int leftToScrollY = newOffsetY - scrollYOffset();
+        if ((leftToScrollX || leftToScrollY) &amp;&amp; m_object-&gt;parent()) {
+            m_object-&gt;parent()-&gt;enclosingLayer()-&gt;scrollByRecursively(leftToScrollX, leftToScrollY);
+            Frame* frame = renderer()-&gt;document()-&gt;frame();
+            if (frame)
+                frame-&gt;eventHandler()-&gt;updateAutoscrollRenderer();
+        }
</ins><span class="cx">     } else if (m_object-&gt;view()-&gt;frameView())
</span><span class="cx">         m_object-&gt;view()-&gt;frameView()-&gt;scrollBy(xDelta, yDelta);
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+
</ins><span class="cx"> void
</span><span class="cx"> RenderLayer::scrollOffset(int&amp; x, int&amp; y)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderLayer.h (35932 => 35933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderLayer.h        2008-08-26 16:07:16 UTC (rev 35932)
+++ trunk/WebCore/rendering/RenderLayer.h        2008-08-26 17:51:03 UTC (rev 35933)
</span><span class="lines">@@ -205,6 +205,7 @@
</span><span class="cx">     void panScrollFromPoint(const IntPoint&amp;);
</span><span class="cx"> 
</span><span class="cx">     // Scrolling methods for layers that can scroll their overflow.
</span><ins>+    void scrollByRecursively(int xDelta, int yDelta);
</ins><span class="cx">     void scrollOffset(int&amp; x, int&amp; y);
</span><span class="cx">     void subtractScrollOffset(int&amp; x, int&amp; y);
</span><span class="cx">     int scrollXOffset() const { return m_scrollX + m_scrollOriginX; }
</span></span></pre></div>
<a id="trunkWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/WebCore/rendering/RenderObject.cpp (35932 => 35933)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/WebCore/rendering/RenderObject.cpp        2008-08-26 16:07:16 UTC (rev 35932)
+++ trunk/WebCore/rendering/RenderObject.cpp        2008-08-26 17:51:03 UTC (rev 35933)
</span><span class="lines">@@ -638,6 +638,9 @@
</span><span class="cx">     
</span><span class="cx"> bool RenderObject::canBeProgramaticallyScrolled(bool scrollToAnchor) const
</span><span class="cx"> {
</span><ins>+    if (!layer())
+        return false;
+
</ins><span class="cx">     return (hasOverflowClip() &amp;&amp; (scrollsOverflow() || (node() &amp;&amp; node()-&gt;isContentEditable()))) || ((node() &amp;&amp; node()-&gt;isDocumentNode()) &amp;&amp; (hasScrollableView() || scrollToAnchor));
</span><span class="cx"> }
</span><span class="cx">     
</span><span class="lines">@@ -648,14 +651,12 @@
</span><span class="cx"> 
</span><span class="cx"> void RenderObject::autoscroll()
</span><span class="cx"> {
</span><del>-    if (RenderLayer* l = layer())
-        l-&gt;autoscroll();
</del><ins>+    layer()-&gt;autoscroll();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RenderObject::panScroll(const IntPoint&amp; source)
</span><span class="cx"> {
</span><del>-    if (RenderLayer* l = layer())
-        l-&gt;panScrollFromPoint(source);
</del><ins>+    layer()-&gt;panScrollFromPoint(source);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> bool RenderObject::hasStaticX() const
</span></span></pre>
</div>
</div>

</body>
</html>