<!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>[185234] 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/185234">185234</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2015-06-04 18:35:40 -0700 (Thu, 04 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>Latching algorithm in findEnclosingOverflowScroll is broken
https://bugs.webkit.org/show_bug.cgi?id=145642
&lt;rdar://problem/21242308&gt;

Reviewed by Simon Fraser.

Source/WebCore:

Test: platform/mac-wk2/tiled-drawing/scrolling/iframe_in_iframe.html

* page/mac/EventHandlerMac.mm:
(WebCore::scrollableAreaForBox): Added helper function.
(WebCore::findEnclosingScrollableContainer): Renamed from findEnclosingOverflowScroll.
Only identify something as our scroll element if it can be scrolled in either
axis of the gesture's motion.
(WebCore::scrollableAreaForContainerNode): Use new helper function.
(WebCore::EventHandler::platformPrepareForWheelEvents): Use new function
name, and pass horizontal and vertical deltas.
(WebCore::findEnclosingOverflowScroll): Deleted.

LayoutTests:

Revise the new latching test to remove the image &quot;max-width: 100%&quot; style, which was
preventing this example from having a horizontal scrollable region at the top of the
file.
        
It still correctly tests the subpixel bug from Bug 145637.

* platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html: Remove width
adjustment on image.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingresourcesinner_contenthtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepagemacEventHandlerMacmm">trunk/Source/WebCore/page/mac/EventHandlerMac.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (185233 => 185234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-06-05 01:32:21 UTC (rev 185233)
+++ trunk/LayoutTests/ChangeLog        2015-06-05 01:35:40 UTC (rev 185234)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-06-04  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        Latching algorithm in findEnclosingOverflowScroll is broken
+        https://bugs.webkit.org/show_bug.cgi?id=145642
+        &lt;rdar://problem/21242308&gt;
+
+        Reviewed by Simon Fraser.
+
+        Revise the new latching test to remove the image &quot;max-width: 100%&quot; style, which was
+        preventing this example from having a horizontal scrollable region at the top of the
+        file.
+        
+        It still correctly tests the subpixel bug from Bug 145637.
+
+        * platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html: Remove width
+        adjustment on image.
+
</ins><span class="cx"> 2015-06-04  Benjamin Poulain  &lt;bpoulain@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Combine tiny DFAs into slightly larger ones
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingresourcesinner_contenthtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html (185233 => 185234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html        2015-06-05 01:32:21 UTC (rev 185233)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/resources/inner_content.html        2015-06-05 01:35:40 UTC (rev 185234)
</span><span class="lines">@@ -3,12 +3,6 @@
</span><span class="cx">     &lt;head&gt;
</span><span class="cx">         &lt;title&gt;Inner iFrame Example&lt;/title&gt;
</span><span class="cx">         &lt;meta charset=&quot;utf-8&quot;&gt;
</span><del>-        &lt;style&gt;
-        img {
-            display:block;
-            max-width:100%;
-        }
-        &lt;/style&gt;
</del><span class="cx">     &lt;/head&gt;
</span><span class="cx">     &lt;body style=&quot;position: relative; min-height: 100%; top: 0px;&quot;&gt;
</span><span class="cx">         &lt;div style=&quot;overflow:auto;&quot;&gt;
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (185233 => 185234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-06-05 01:32:21 UTC (rev 185233)
+++ trunk/Source/WebCore/ChangeLog        2015-06-05 01:35:40 UTC (rev 185234)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-06-04  Brent Fulgham  &lt;bfulgham@apple.com&gt;
+
+        Latching algorithm in findEnclosingOverflowScroll is broken
+        https://bugs.webkit.org/show_bug.cgi?id=145642
+        &lt;rdar://problem/21242308&gt;
+
+        Reviewed by Simon Fraser.
+
+        Test: platform/mac-wk2/tiled-drawing/scrolling/iframe_in_iframe.html
+
+        * page/mac/EventHandlerMac.mm:
+        (WebCore::scrollableAreaForBox): Added helper function.
+        (WebCore::findEnclosingScrollableContainer): Renamed from findEnclosingOverflowScroll.
+        Only identify something as our scroll element if it can be scrolled in either
+        axis of the gesture's motion.
+        (WebCore::scrollableAreaForContainerNode): Use new helper function.
+        (WebCore::EventHandler::platformPrepareForWheelEvents): Use new function
+        name, and pass horizontal and vertical deltas.
+        (WebCore::findEnclosingOverflowScroll): Deleted.
+
</ins><span class="cx"> 2015-06-04  Gyuyoung Kim  &lt;gyuyoung.kim@webkit.org&gt;
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r185091): Crash happens on indexdb tests
</span></span></pre></div>
<a id="trunkSourceWebCorepagemacEventHandlerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/mac/EventHandlerMac.mm (185233 => 185234)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/mac/EventHandlerMac.mm        2015-06-05 01:32:21 UTC (rev 185233)
+++ trunk/Source/WebCore/page/mac/EventHandlerMac.mm        2015-06-05 01:35:40 UTC (rev 185234)
</span><span class="lines">@@ -771,8 +771,16 @@
</span><span class="cx">     return PlatformEvent::CtrlKey | PlatformEvent::AltKey;
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-static ContainerNode* findEnclosingOverflowScroll(ContainerNode* node)
</del><ins>+static ScrollableArea* scrollableAreaForBox(RenderBox&amp; box)
</ins><span class="cx"> {
</span><ins>+    if (is&lt;RenderListBox&gt;(box))
+        return downcast&lt;RenderListBox&gt;(&amp;box);
+
+    return box.layer();
+}
+    
+static ContainerNode* findEnclosingScrollableContainer(ContainerNode* node, float deltaX, float deltaY)
+{
</ins><span class="cx">     // Find the first node with a valid scrollable area starting with the current
</span><span class="cx">     // node and traversing its parents (or shadow hosts).
</span><span class="cx">     for (ContainerNode* candidate = node; candidate; candidate = candidate-&gt;parentOrShadowHostNode()) {
</span><span class="lines">@@ -783,8 +791,14 @@
</span><span class="cx">             return nullptr;
</span><span class="cx"> 
</span><span class="cx">         RenderBox* box = candidate-&gt;renderBox();
</span><del>-        if (box &amp;&amp; box-&gt;canBeScrolledAndHasScrollableArea())
-            return candidate;
</del><ins>+        if (box &amp;&amp; box-&gt;canBeScrolledAndHasScrollableArea()) {
+            if (ScrollableArea* scrollableArea = scrollableAreaForBox(*box)) {
+                if (((deltaY &gt; 0) &amp;&amp; !scrollableArea-&gt;scrolledToTop()) || ((deltaY &lt; 0) &amp;&amp; !scrollableArea-&gt;scrolledToBottom())
+                    || ((deltaX &gt; 0) &amp;&amp; !scrollableArea-&gt;scrolledToRight()) || ((deltaX &lt; 0) &amp;&amp; !scrollableArea-&gt;scrolledToLeft())) {
+                    return candidate;
+                }
+            }
+        }
</ins><span class="cx">     }
</span><span class="cx">     
</span><span class="cx">     return nullptr;
</span><span class="lines">@@ -887,12 +901,8 @@
</span><span class="cx"> {
</span><span class="cx">     ScrollableArea* scrollableArea = nullptr;
</span><span class="cx"> 
</span><del>-    if (RenderBox* box = container.renderBox()) {
-        if (is&lt;RenderListBox&gt;(*box))
-            scrollableArea = downcast&lt;RenderListBox&gt;(box);
-        else
-            scrollableArea = box-&gt;layer();
-    }
</del><ins>+    if (RenderBox* box = container.renderBox())
+        scrollableArea = scrollableAreaForBox(*box);
</ins><span class="cx"> 
</span><span class="cx">     return scrollableArea;
</span><span class="cx"> }
</span><span class="lines">@@ -916,7 +926,7 @@
</span><span class="cx">             scrollableContainer = wheelEventTarget;
</span><span class="cx">             scrollableArea = scrollViewForEventTarget(wheelEventTarget.get());
</span><span class="cx">         } else {
</span><del>-            scrollableContainer = findEnclosingOverflowScroll(wheelEventTarget.get());
</del><ins>+            scrollableContainer = findEnclosingScrollableContainer(wheelEventTarget.get(), wheelEvent.deltaX(), wheelEvent.deltaY());
</ins><span class="cx">             if (scrollableContainer)
</span><span class="cx">                 scrollableArea = scrollableAreaForContainerNode(*scrollableContainer);
</span><span class="cx">             else {
</span></span></pre>
</div>
</div>

</body>
</html>