<!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>[182215] 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/182215">182215</a></dd>
<dt>Author</dt> <dd>simon.fraser@apple.com</dd>
<dt>Date</dt> <dd>2015-03-31 16:42:31 -0700 (Tue, 31 Mar 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Make it possible to compute a region for elements on the page that have wheel event handlers
https://bugs.webkit.org/show_bug.cgi?id=142807
Reviewed by David Hyatt.
Source/WebCore:
Make it possible to compute a region that covers the elements on the page that have
a wheel event handler. This region may overestimate, but must not underestimate the area.
Elements with wheel handlers are registered on the document, and when a document gains
its first wheel handler, it registers the ownerElement in the parent document. Thus, on
the main frame, the region encompasses elements with handlers, and iframes whose subdocuments
have handlers.
Element gains some functions that allow it to return a rect which is the bounds of the element's
renderer, and renders for its descendant elements, which is the size or larger than the event
handling region for that element. Some configurations (e.g. position:fixed) require special
treatment.
Document::absoluteRegionForEventTargets() can then iterate over all elements in the given set,
and build a Region for those (short-circuiting if the document itself has a handler).
The new code is exercised for the debug MouseWheelRegionOverlay, and also added to the
non-fast scrollable region, used by threaded scrolling.
Tests: platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes.html
platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child.html
platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns.html
platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html
platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed.html
platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document.html
platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed.html
platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic.html
* dom/ContainerNode.h:
(WebCore::ContainerNode::absoluteEventHandlerBounds): Base class implementation; returns empty rect.
* dom/Document.cpp:
(WebCore::Document::prepareForDestruction): Unregister from the parent document.
(WebCore::Document::didAddWheelEventHandler): Add to the wheel handler set. Tell the parent
document if we are adding wheel handlers for the first time. Eventually the wheelEventHandlerCountChanged()
code will be removed, now we have the set. Tell debug overlays that we changed.
(WebCore::Document::didRemoveWheelEventHandler): Remove from the set, and unregister with the parent
document if necessary. Tell debug overlays that we changed.
(WebCore::Document::didAddTouchEventHandler): Minor cleanup.
(WebCore::Document::didRemoveTouchEventHandler): Ditto.
(WebCore::Document::didRemoveEventTargetNode): Remove from wheel targets.
(WebCore::Document::absoluteEventHandlerBounds): Implementation of the ContainerNode
function, just return the document bounds.
(WebCore::Document::absoluteRegionForEventTargets): Iterate over the given event targets,
and call absoluteEventHandlerBounds() on each.
* dom/Document.h:
(WebCore::Document::wheelEventTargets):
* dom/Element.cpp:
(WebCore::layoutOverflowRectContainsAllDescendants): Return true if we can determine that the
layoutOverflow bounds of the given renderer contains the renderers of all descendant elements.
(WebCore::Element::eventBounds): Get the "event handling" bounds of this element (excluding
descendants), and while doing so, compute whether any descendants are position:fixed, and whether
these bounds are known to include descendants.
(WebCore::Element::eventBoundsOfElementAndDescendants): Recursive function that short-circuits
if it can determine that descendants are enclosed by the bounds.
(WebCore::Element::absoluteEventHandlerBounds):
* dom/Element.h:
* page/DebugPageOverlays.cpp:
(WebCore::MouseWheelRegionOverlay::updateRegion): Ask the document for the region of wheel
event handlers.
* page/scrolling/ScrollingCoordinator.cpp:
(WebCore::ScrollingCoordinator::computeNonFastScrollableRegion): Add the wheel handler region
to the non-fast scrollable region.
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollTo): Overflow scrolling needs to dirty event regions.
* rendering/RenderObject.cpp:
(WebCore::RenderObject::absoluteBoundingBoxRect): Need to pass the "wasFixed" flag out
of this function.
(WebCore::RenderObject::localToAbsolute): Ditto.
* rendering/RenderObject.h:
LayoutTests:
Tests that dump the non-fast-scrollable region, for various rendering configurations.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/gain-wheel-handler.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/lose-wheel-handler.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/wheel-handler-region-helper.js: Added.
(rectsAsString):
(dumpRegion):
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed.html: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic-expected.txt: Added.
* platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoredomContainerNodeh">trunk/Source/WebCore/dom/ContainerNode.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCoredomDocumenth">trunk/Source/WebCore/dom/Document.h</a></li>
<li><a href="#trunkSourceWebCoredomElementcpp">trunk/Source/WebCore/dom/Element.cpp</a></li>
<li><a href="#trunkSourceWebCoredomElementh">trunk/Source/WebCore/dom/Element.h</a></li>
<li><a href="#trunkSourceWebCorepageDebugPageOverlayscpp">trunk/Source/WebCore/page/DebugPageOverlays.cpp</a></li>
<li><a href="#trunkSourceWebCorepagescrollingScrollingCoordinatorcpp">trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjectcpp">trunk/Source/WebCore/rendering/RenderObject.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderObjecth">trunk/Source/WebCore/rendering/RenderObject.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/</li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionhandlersiniframesexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionhandlersiniframeshtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes.html</a></li>
<li>trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/</li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionresourcesgainwheelhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/gain-wheel-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionresourceslosewheelhandlerhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/lose-wheel-handler.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionresourceswheelhandlerregionhelperjs">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/wheel-handler-region-helper.js</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerfixedchildexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerfixedchildhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerincolumnsexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerincolumnshtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinoverflowscrollexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-overflow-scroll-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinoverflowscrollhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-overflow-scroll.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinregionexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinregionhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinsidefixedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinsidefixedhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerondocumentexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerondocumenthtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandleronfixedexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandleronfixedhtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerregionbasicexpectedtxt">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerregionbasichtml">trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/LayoutTests/ChangeLog 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -1,3 +1,32 @@
</span><ins>+2015-03-31 Simon Fraser <simon.fraser@apple.com>
+
+ Make it possible to compute a region for elements on the page that have wheel event handlers
+ https://bugs.webkit.org/show_bug.cgi?id=142807
+
+ Reviewed by David Hyatt.
+
+ Tests that dump the non-fast-scrollable region, for various rendering configurations.
+
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/gain-wheel-handler.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/lose-wheel-handler.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/wheel-handler-region-helper.js: Added.
+ (rectsAsString):
+ (dumpRegion):
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed.html: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic-expected.txt: Added.
+ * platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic.html: Added.
+
</ins><span class="cx"> 2015-03-31 Dean Jackson <dino@apple.com>
</span><span class="cx">
</span><span class="cx"> accessibility/aria-hidden-hides-all-elements.html fails on Windows
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionhandlersiniframesexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,2 @@
</span><ins>+
+20, 12 - 320, 162
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionhandlersiniframeshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,49 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ iframe {
+ display: block;
+ margin: 10px;
+ }
+ </style>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ var notificationsPending = 3;
+
+ // Called from subframes.
+ function frameChanged()
+ {
+ receivedNotification();
+ }
+
+ function mainFrameLoaded()
+ {
+ receivedNotification();
+ }
+
+ function receivedNotification()
+ {
+ if (!--notificationsPending) {
+ dumpRegion();
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }
+ }
+
+ window.addEventListener('load', mainFrameLoaded, false);
+ </script>
+</head>
+<body>
+
+<iframe src="resources/gain-wheel-handler.html"></iframe>
+<iframe src="resources/lose-wheel-handler.html"></iframe>
+
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionresourcesgainwheelhandlerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/gain-wheel-handler.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/gain-wheel-handler.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/gain-wheel-handler.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,32 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ width: 100px;
+ height: 100px;
+ border: 4px solid black;
+ }
+ </style>
+ <script>
+ function addHandler()
+ {
+ window.setTimeout(function() {
+ var target = document.getElementById('target');
+ target.addEventListener('mousewheel', function(e) { });
+ parent.frameChanged();
+ }, 0);
+ }
+
+ window.addEventListener('load', addHandler, false);
+ </script>
+</head>
+<body>
+
+<div id="target" class="box">
+</div>
+
+<pre id="output"></pre>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionresourceslosewheelhandlerhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/lose-wheel-handler.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/lose-wheel-handler.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/lose-wheel-handler.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,41 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ width: 100px;
+ height: 100px;
+ border: 4px solid black;
+ }
+ </style>
+ <script>
+ function wheelHandler(e)
+ {
+ }
+
+ function removeHandler()
+ {
+ window.setTimeout(function() {
+ var target = document.getElementById('target');
+ target.removeEventListener('mousewheel', wheelHandler);
+ parent.frameChanged();
+ }, 0);
+ }
+
+ window.addEventListener('load', removeHandler, false);
+ </script>
+</head>
+<body>
+
+<div id="target" class="box">
+</div>
+
+<pre id="output"></pre>
+
+<script>
+var target = document.getElementById('target');
+target.addEventListener('mousewheel', wheelHandler);
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionresourceswheelhandlerregionhelperjs"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/wheel-handler-region-helper.js (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/wheel-handler-region-helper.js (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/resources/wheel-handler-region-helper.js 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,22 @@
</span><ins>+if (window.testRunner)
+ testRunner.dumpAsText();
+
+function rectsAsString(rects)
+{
+ var result = "";
+ for (var i = 0; i < rects.length; ++i) {
+ var rect = rects[i];
+ if (i)
+ result += '\n';
+ result += rect.left + ', ' + rect.top + ' - ' + rect.right + ', ' + rect.bottom;
+ }
+ return result;
+}
+
+function dumpRegion()
+{
+ if (window.internals) {
+ var rects = window.internals.nonFastScrollableRects();
+ document.getElementById('output').textContent = rectsAsString(rects);
+ }
+}
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerfixedchildexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+50, 50 - 150, 150
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerfixedchildhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,50 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .fixed {
+ position: fixed;
+ top: 50px;
+ left: 50px;
+ }
+
+ .box {
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ }
+
+ .child {
+ position: relative;
+ left: 50px;
+ top: 50px;
+ }
+ #output {
+ margin-top: 520px;
+ }
+ </style>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ function dumpRegion()
+ {
+ if (window.internals) {
+ var rects = window.internals.nonFastScrollableRects();
+ document.getElementById('output').textContent = rectsAsString(rects);
+ }
+ }
+
+ window.addEventListener('load', dumpRegion, false);
+ </script>
+</head>
+<body>
+
+<div class="box">
+ <div class="fixed box" onmousewheel="(void)0">
+ </div>
+</div>
+
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerincolumnsexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+
+28, 20 - 567, 380
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerincolumnshtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .columns {
+ margin: 20px;
+ width: 400px;
+ height: 360px;
+ column-width: 120px;
+ }
+ .target {
+ color: blue;
+ }
+ </style>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ function doTest()
+ {
+ dumpRegion();
+ }
+
+ window.addEventListener('load', doTest);
+ </script>
+</head>
+<body>
+
+<div class="columns">
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ <p class="target" onmousewheel="(void)0">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+</div>
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinoverflowscrollexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-overflow-scroll-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-overflow-scroll-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-overflow-scroll-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+
+8, 8 - 310, 310
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinoverflowscrollhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-overflow-scroll.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-overflow-scroll.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-overflow-scroll.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,47 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ #container {
+ width: 300px;
+ height: 300px;
+ overflow: scroll;
+ border: 1px solid black;
+ }
+ .target {
+ color: blue;
+ }
+ </style>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ if (window.testRunner)
+ testRunner.waitUntilDone();
+
+ function doTest()
+ {
+ window.setTimeout(function() {
+ var scroller = document.getElementById('container');
+ scroller.scrollTop = 200;
+ dumpRegion();
+ if (window.testRunner)
+ testRunner.notifyDone();
+ }, 0)
+ }
+
+ window.addEventListener('load', doTest);
+ </script>
+</head>
+<body>
+
+<div id="container">
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ <p class="target" onmousewheel="(void)0">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+</div>
+
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinregionexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.
+
+39, 151 - 609, 401
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinregionhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,59 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ #content {
+ -webkit-flow-into: flow1;
+ }
+
+ #region1, #region2 {
+ margin: 10px;
+ border: 1px solid black;
+ -webkit-flow-from: flow1;
+ }
+
+ #region1 {
+ margin-left: 30px;
+ width: 300px;
+ height: 200px;
+ }
+
+ #region2 {
+ margin-top: 80px;
+ margin-left: 200px;
+ width: 400px;
+ height: 90px;
+ }
+
+ .target {
+ color: blue;
+ }
+ </style>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ function doTest()
+ {
+ dumpRegion();
+ }
+
+ window.addEventListener('load', doTest);
+ </script>
+</head>
+<body>
+
+<div id="content">
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.</p>
+ <p class="target" onmousewheel="(void)0">Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>
+ <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>
+</div>
+
+<div id="container">
+ <div id="region1"></div>
+ <div id="region2"></div>
+</div>
+
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinsidefixedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+60, 60 - 160, 160
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerinsidefixedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .fixed {
+ position: fixed;
+ top: 10px;
+ left: 10px;
+ }
+
+ .box {
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ }
+
+ .child {
+ position: relative;
+ left: 50px;
+ top: 50px;
+ }
+ #output {
+ margin-top: 520px;
+ }
+ </style>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ window.addEventListener('load', dumpRegion, false);
+ </script>
+</head>
+<body>
+
+<div class="fixed box">
+ <div class="child box" onmousewheel="(void)0">
+ </div>
+</div>
+
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerondocumentexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+0, 0 - 800, 600
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerondocumenthtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,21 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ function doTest()
+ {
+ document.addEventListener('mousewheel', function() { });
+ dumpRegion();
+ }
+
+ window.addEventListener('load', doTest);
+ </script>
+</head>
+<body>
+
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandleronfixedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+10, 10 - 110, 110
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandleronfixedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,34 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .fixed {
+ position: fixed;
+ top: 10px;
+ left: 10px;
+ }
+
+ .box {
+ height: 100px;
+ width: 100px;
+ background-color: blue;
+ }
+ #output {
+ margin-top: 520px;
+ }
+ </style>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ window.addEventListener('load', dumpRegion, false);
+ </script>
+</head>
+<body>
+
+<div class="fixed box" onmousewheel="(void)0">
+</div>
+
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerregionbasicexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic-expected.txt (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic-expected.txt (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic-expected.txt 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,10 @@
</span><ins>+Some text
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. here Container
+Intermediate
+Child
+Container
+Intermediate
+Child
+8, 8 - 777, 329
+9, 369 - 290, 425
+9, 501 - 290, 601
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2tileddrawingscrollingnonfastregionwheelhandlerregionbasichtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic.html (0 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic.html (rev 0)
+++ trunk/LayoutTests/platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic.html 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -0,0 +1,81 @@
</span><ins>+<!DOCTYPE html>
+
+<html>
+<head>
+ <style>
+ .box {
+ width: 100px;
+ height: 100px;
+ border: 4px solid black;
+ position: relative;
+ }
+
+ .overflowing-transformed {
+ position: absolute;
+ top: 100px;
+ left: 300px;
+ width: 200px;
+ height: 100px;
+ border: 1px solid green;
+ -webkit-transform: rotate(30deg);
+ }
+
+ .container {
+ position: absolute;
+ top: 350px;
+ height: 100px;
+ border: 1px solid green;
+ }
+
+ .inner {
+ position: relative;
+ top: 20px;
+ left: 200px;
+ background-color: orange;
+ }
+
+ #output {
+ margin-top: 520px;
+ }
+ </style>
+ <script src="resources/wheel-handler-region-helper.js"></script>
+ <script>
+ window.addEventListener('load', dumpRegion, false);
+ </script>
+</head>
+<body>
+
+<span id="target" onmousewheel="(void)0">Some text
+ <div class="box">
+ <div class="overflowing-transformed">
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.
+ </div>
+ </div>
+here</span>
+
+<!-- Handler on skipped containing block -->
+<div class="container" onmousewheel="(void)0" style="top: 500px;">
+ Container
+ <div class="intermediate">
+ Intermediate
+ <div class="inner">
+ Child
+ </div>
+ </div>
+</div>
+
+<div class="container">
+ Container
+ <!-- Handler on skipped containing block -->
+ <div class="intermediate" onmousewheel="(void)0">
+ Intermediate
+ <div class="inner">
+ Child
+ </div>
+ </div>
+</div>
+
+<pre id="output"></pre>
+
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/ChangeLog 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -1,3 +1,80 @@
</span><ins>+2015-03-31 Simon Fraser <simon.fraser@apple.com>
+
+ Make it possible to compute a region for elements on the page that have wheel event handlers
+ https://bugs.webkit.org/show_bug.cgi?id=142807
+
+ Reviewed by David Hyatt.
+
+ Make it possible to compute a region that covers the elements on the page that have
+ a wheel event handler. This region may overestimate, but must not underestimate the area.
+
+ Elements with wheel handlers are registered on the document, and when a document gains
+ its first wheel handler, it registers the ownerElement in the parent document. Thus, on
+ the main frame, the region encompasses elements with handlers, and iframes whose subdocuments
+ have handlers.
+
+ Element gains some functions that allow it to return a rect which is the bounds of the element's
+ renderer, and renders for its descendant elements, which is the size or larger than the event
+ handling region for that element. Some configurations (e.g. position:fixed) require special
+ treatment.
+
+ Document::absoluteRegionForEventTargets() can then iterate over all elements in the given set,
+ and build a Region for those (short-circuiting if the document itself has a handler).
+
+ The new code is exercised for the debug MouseWheelRegionOverlay, and also added to the
+ non-fast scrollable region, used by threaded scrolling.
+
+ Tests: platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/handlers-in-iframes.html
+ platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-fixed-child.html
+ platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-columns.html
+ platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-in-region.html
+ platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-inside-fixed.html
+ platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-document.html
+ platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-on-fixed.html
+ platform/mac-wk2/tiled-drawing/scrolling/non-fast-region/wheel-handler-region-basic.html
+
+ * dom/ContainerNode.h:
+ (WebCore::ContainerNode::absoluteEventHandlerBounds): Base class implementation; returns empty rect.
+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction): Unregister from the parent document.
+ (WebCore::Document::didAddWheelEventHandler): Add to the wheel handler set. Tell the parent
+ document if we are adding wheel handlers for the first time. Eventually the wheelEventHandlerCountChanged()
+ code will be removed, now we have the set. Tell debug overlays that we changed.
+ (WebCore::Document::didRemoveWheelEventHandler): Remove from the set, and unregister with the parent
+ document if necessary. Tell debug overlays that we changed.
+ (WebCore::Document::didAddTouchEventHandler): Minor cleanup.
+ (WebCore::Document::didRemoveTouchEventHandler): Ditto.
+ (WebCore::Document::didRemoveEventTargetNode): Remove from wheel targets.
+ (WebCore::Document::absoluteEventHandlerBounds): Implementation of the ContainerNode
+ function, just return the document bounds.
+ (WebCore::Document::absoluteRegionForEventTargets): Iterate over the given event targets,
+ and call absoluteEventHandlerBounds() on each.
+ * dom/Document.h:
+ (WebCore::Document::wheelEventTargets):
+ * dom/Element.cpp:
+ (WebCore::layoutOverflowRectContainsAllDescendants): Return true if we can determine that the
+ layoutOverflow bounds of the given renderer contains the renderers of all descendant elements.
+ (WebCore::Element::eventBounds): Get the "event handling" bounds of this element (excluding
+ descendants), and while doing so, compute whether any descendants are position:fixed, and whether
+ these bounds are known to include descendants.
+ (WebCore::Element::eventBoundsOfElementAndDescendants): Recursive function that short-circuits
+ if it can determine that descendants are enclosed by the bounds.
+ (WebCore::Element::absoluteEventHandlerBounds):
+ * dom/Element.h:
+ * page/DebugPageOverlays.cpp:
+ (WebCore::MouseWheelRegionOverlay::updateRegion): Ask the document for the region of wheel
+ event handlers.
+ * page/scrolling/ScrollingCoordinator.cpp:
+ (WebCore::ScrollingCoordinator::computeNonFastScrollableRegion): Add the wheel handler region
+ to the non-fast scrollable region.
+ * rendering/RenderLayer.cpp:
+ (WebCore::RenderLayer::scrollTo): Overflow scrolling needs to dirty event regions.
+ * rendering/RenderObject.cpp:
+ (WebCore::RenderObject::absoluteBoundingBoxRect): Need to pass the "wasFixed" flag out
+ of this function.
+ (WebCore::RenderObject::localToAbsolute): Ditto.
+ * rendering/RenderObject.h:
+
</ins><span class="cx"> 2015-03-31 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix bindings tests results after <http://trac.webkit.org/changeset/182205>.
</span></span></pre></div>
<a id="trunkSourceWebCoredomContainerNodeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ContainerNode.h (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ContainerNode.h 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/dom/ContainerNode.h 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -136,6 +136,10 @@
</span><span class="cx">
</span><span class="cx"> RenderElement* renderer() const;
</span><span class="cx">
</span><ins>+ // Return a bounding box in absolute coordinates enclosing this node and all its descendants.
+ // This gives the area within which events may get handled by a hander registered on this node.
+ virtual LayoutRect absoluteEventHandlerBounds(bool& /* includesFixedPositionElements */) { return LayoutRect(); }
+
</ins><span class="cx"> Element* querySelector(const String& selectors, ExceptionCode&);
</span><span class="cx"> RefPtr<NodeList> querySelectorAll(const String& selectors, ExceptionCode&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/dom/Document.cpp 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -47,6 +47,7 @@
</span><span class="cx"> #include "DOMNamedFlowCollection.h"
</span><span class="cx"> #include "DOMWindow.h"
</span><span class="cx"> #include "DateComponents.h"
</span><ins>+#include "DebugPageOverlays.h"
</ins><span class="cx"> #include "Dictionary.h"
</span><span class="cx"> #include "DocumentLoader.h"
</span><span class="cx"> #include "DocumentMarkerController.h"
</span><span class="lines">@@ -2245,6 +2246,9 @@
</span><span class="cx"> parentDocument()->didRemoveEventTargetNode(*this);
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+ if (m_wheelEventTargets && m_wheelEventTargets->size() && parentDocument())
+ parentDocument()->didRemoveEventTargetNode(*this);
+
</ins><span class="cx"> if (m_mediaQueryMatcher)
</span><span class="cx"> m_mediaQueryMatcher->documentDestroyed();
</span><span class="cx">
</span><span class="lines">@@ -5998,29 +6002,61 @@
</span><span class="cx"> scrollingCoordinator->frameViewWheelEventHandlerCountChanged(*frameView);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didAddWheelEventHandler(Node&)
</del><ins>+void Document::didAddWheelEventHandler(Node& node)
</ins><span class="cx"> {
</span><span class="cx"> ++m_wheelEventHandlerCount;
</span><ins>+
+ if (!m_wheelEventTargets)
+ m_wheelEventTargets = std::make_unique<EventTargetSet>();
+
+ m_wheelEventTargets->add(&node);
+
+ if (Document* parent = parentDocument()) {
+ parent->didAddWheelEventHandler(*this);
+ return;
+ }
+
</ins><span class="cx"> wheelEventHandlerCountChanged(this);
</span><ins>+
+ if (Frame* frame = this->frame())
+ DebugPageOverlays::didChangeEventHandlers(*frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Document::didRemoveWheelEventHandler(Node&)
</del><ins>+void Document::didRemoveWheelEventHandler(Node& node)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(m_wheelEventHandlerCount > 0);
</span><span class="cx"> --m_wheelEventHandlerCount;
</span><ins>+
+ if (!m_wheelEventTargets)
+ return;
+
+ ASSERT(m_wheelEventTargets->contains(&node));
+ m_wheelEventTargets->remove(&node);
+
+ if (Document* parent = parentDocument()) {
+ parent->didRemoveWheelEventHandler(*this);
+ return;
+ }
+
</ins><span class="cx"> wheelEventHandlerCountChanged(this);
</span><ins>+
+ if (Frame* frame = this->frame())
+ DebugPageOverlays::didChangeEventHandlers(*frame);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Document::didAddTouchEventHandler(Node& handler)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- if (!m_touchEventTargets.get())
</del><ins>+ if (!m_touchEventTargets)
</ins><span class="cx"> m_touchEventTargets = std::make_unique<EventTargetSet>();
</span><ins>+
</ins><span class="cx"> m_touchEventTargets->add(&handler);
</span><ins>+
</ins><span class="cx"> if (Document* parent = parentDocument()) {
</span><span class="cx"> parent->didAddTouchEventHandler(*this);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> if (Page* page = this->page()) {
</span><span class="cx"> if (m_touchEventTargets->size() == 1)
</span><span class="cx"> page->chrome().client().needTouchEvents(true);
</span><span class="lines">@@ -6033,10 +6069,12 @@
</span><span class="cx"> void Document::didRemoveTouchEventHandler(Node& handler)
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><del>- if (!m_touchEventTargets.get())
</del><ins>+ if (!m_touchEventTargets)
</ins><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> ASSERT(m_touchEventTargets->contains(&handler));
</span><span class="cx"> m_touchEventTargets->remove(&handler);
</span><ins>+
</ins><span class="cx"> if (Document* parent = parentDocument()) {
</span><span class="cx"> parent->didRemoveTouchEventHandler(*this);
</span><span class="cx"> return;
</span><span class="lines">@@ -6047,6 +6085,8 @@
</span><span class="cx"> return;
</span><span class="cx"> if (m_touchEventTargets->size())
</span><span class="cx"> return;
</span><ins>+
+ // FIXME: why can't we trust m_touchEventTargets?
</ins><span class="cx"> for (const Frame* frame = &page->mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (frame->document() && frame->document()->hasTouchEventHandlers())
</span><span class="cx"> return;
</span><span class="lines">@@ -6065,11 +6105,53 @@
</span><span class="cx"> if ((&handler == this || m_touchEventTargets->isEmpty()) && parentDocument())
</span><span class="cx"> parentDocument()->didRemoveEventTargetNode(*this);
</span><span class="cx"> }
</span><del>-#else
- UNUSED_PARAM(handler);
</del><span class="cx"> #endif
</span><ins>+
+ if (m_wheelEventTargets) {
+ m_wheelEventTargets->removeAll(&handler);
+ if ((&handler == this || m_wheelEventTargets->isEmpty()) && parentDocument())
+ parentDocument()->didRemoveEventTargetNode(*this);
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+LayoutRect Document::absoluteEventHandlerBounds(bool& includesFixedPositionElements)
+{
+ includesFixedPositionElements = false;
+ if (RenderView* renderView = this->renderView())
+ return renderView->documentRect();
+
+ return LayoutRect();
+}
+
+Region Document::absoluteRegionForEventTargets(const EventTargetSet* targets)
+{
+ if (!targets)
+ return Region();
+
+ Region targetRegion;
+ bool insideFixedPosition = false;
+
+ for (auto it : *targets) {
+ LayoutRect rootRelativeBounds;
+
+ if (is<Document>(it.key)) {
+ Document* document = downcast<Document>(it.key);
+ if (document == this)
+ rootRelativeBounds = absoluteEventHandlerBounds(insideFixedPosition);
+ else if (Element* element = document->ownerElement())
+ rootRelativeBounds = element->absoluteEventHandlerBounds(insideFixedPosition);
+ } else if (is<Element>(it.key)) {
+ Element* element = downcast<Element>(it.key);
+ rootRelativeBounds = element->absoluteEventHandlerBounds(insideFixedPosition);
+ }
+
+ if (!rootRelativeBounds.isEmpty())
+ targetRegion.unite(Region(enclosingIntRect(rootRelativeBounds)));
+ }
+
+ return targetRegion;
+}
+
</ins><span class="cx"> void Document::updateLastHandledUserGestureTimestamp()
</span><span class="cx"> {
</span><span class="cx"> m_lastHandledUserGestureTimestamp = monotonicallyIncreasingTime();
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumenth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.h (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.h 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/dom/Document.h 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> #include "PageVisibilityState.h"
</span><span class="cx"> #include "PlatformScreen.h"
</span><span class="cx"> #include "ReferrerPolicy.h"
</span><ins>+#include "Region.h"
</ins><span class="cx"> #include "RenderPtr.h"
</span><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "StringWithDirection.h"
</span><span class="lines">@@ -1148,6 +1149,12 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ const EventTargetSet* wheelEventTargets() const { return m_wheelEventTargets.get(); }
+
+ Region absoluteRegionForEventTargets(const EventTargetSet*);
+
+ LayoutRect absoluteEventHandlerBounds(bool&) override final;
+
</ins><span class="cx"> bool visualUpdatesAllowed() const { return m_visualUpdatesAllowed; }
</span><span class="cx">
</span><span class="cx"> bool isInDocumentWrite() { return m_writeRecursionDepth > 0; }
</span><span class="lines">@@ -1561,6 +1568,7 @@
</span><span class="cx"> #if ENABLE(TOUCH_EVENTS)
</span><span class="cx"> std::unique_ptr<EventTargetSet> m_touchEventTargets;
</span><span class="cx"> #endif
</span><ins>+ std::unique_ptr<EventTargetSet> m_wheelEventTargets;
</ins><span class="cx">
</span><span class="cx"> double m_lastHandledUserGestureTimestamp;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.cpp (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.cpp 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/dom/Element.cpp 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> #include "NodeRenderStyle.h"
</span><span class="cx"> #include "PlatformWheelEvent.h"
</span><span class="cx"> #include "PointerLockController.h"
</span><ins>+#include "RenderFlowThread.h"
</ins><span class="cx"> #include "RenderLayer.h"
</span><span class="cx"> #include "RenderNamedFlowFragment.h"
</span><span class="cx"> #include "RenderRegion.h"
</span><span class="lines">@@ -925,6 +926,126 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static bool layoutOverflowRectContainsAllDescendants(const RenderElement& renderer)
+{
+ if (renderer.isRenderView())
+ return true;
+
+ if (!renderer.element())
+ return false;
+
+ // If there are any position:fixed inside of us, game over.
+ if (auto viewPositionedObjects = renderer.view().positionedObjects()) {
+ for (RenderBox* it : *viewPositionedObjects) {
+ if (it != &renderer && it->style().position() == FixedPosition && renderer.element()->contains(it->element()))
+ return false;
+ }
+ }
+
+ if (renderer.canContainAbsolutelyPositionedObjects()) {
+ // Our layout overflow will include all descendant positioned elements.
+ return true;
+ }
+
+ // This renderer may have positioned descendants whose containing block is some ancestor.
+ if (auto containingBlock = renderer.containingBlockForAbsolutePosition()) {
+ if (auto positionedObjects = containingBlock->positionedObjects()) {
+ for (RenderBox* it : *positionedObjects) {
+ if (it != &renderer && renderer.element()->contains(it->element()))
+ return false;
+ }
+ }
+ }
+
+ return false;
+}
+
+LayoutRect Element::absoluteEventBounds(bool& boundsIncludeAllDescendantElements, bool& includesFixedPositionElements)
+{
+ boundsIncludeAllDescendantElements = false;
+ includesFixedPositionElements = false;
+
+ if (!renderer())
+ return LayoutRect();
+
+ LayoutRect result;
+ if (isSVGElement()) {
+ // Get the bounding rectangle from the SVG model.
+ SVGElement& svgElement = downcast<SVGElement>(*this);
+ FloatRect localRect;
+ if (svgElement.getBoundingBox(localRect))
+ result = LayoutRect(renderer()->localToAbsoluteQuad(localRect, UseTransforms, &includesFixedPositionElements).boundingBox());
+ } else {
+ if (is<RenderBox>(renderer())) {
+ RenderBox& box = *downcast<RenderBox>(renderer());
+
+ bool computedBounds = false;
+
+ if (RenderFlowThread* flowThread = box.flowThreadContainingBlock()) {
+ bool wasFixed = false;
+ Vector<FloatQuad> quads;
+ FloatRect localRect(0, 0, box.width(), box.height());
+ if (flowThread->absoluteQuadsForBox(quads, &wasFixed, &box, localRect.y(), localRect.maxY())) {
+ FloatRect quadBounds = quads[0].boundingBox();
+ for (size_t i = 1; i < quads.size(); ++i)
+ quadBounds.unite(quads[i].boundingBox());
+
+ result = LayoutRect(quadBounds);
+ computedBounds = true;
+ } else {
+ // Probably columns. Just return the bounds of the multicol block for now.
+ // FIXME: this doesn't handle nested columns.
+ RenderElement* multicolContainer = flowThread->parent();
+ if (multicolContainer && is<RenderBox>(multicolContainer)) {
+ LayoutRect overflowRect = downcast<RenderBox>(multicolContainer)->layoutOverflowRect();
+ result = LayoutRect(multicolContainer->localToAbsoluteQuad(FloatRect(overflowRect), UseTransforms, &includesFixedPositionElements).boundingBox());
+ computedBounds = true;
+ }
+ }
+ }
+
+ if (!computedBounds) {
+ LayoutRect overflowRect = box.layoutOverflowRect();
+ result = LayoutRect(box.localToAbsoluteQuad(FloatRect(overflowRect), UseTransforms, &includesFixedPositionElements).boundingBox());
+ boundsIncludeAllDescendantElements = layoutOverflowRectContainsAllDescendants(box);
+ }
+ } else
+ result = LayoutRect(renderer()->absoluteBoundingBoxRect(true /* useTransforms */, &includesFixedPositionElements));
+ }
+
+ return result;
+}
+
+LayoutRect Element::absoluteEventBoundsOfElementAndDescendants(bool& includesFixedPositionElements)
+{
+ bool boundsIncludeDescendants;
+ LayoutRect result = absoluteEventBounds(boundsIncludeDescendants, includesFixedPositionElements);
+ if (boundsIncludeDescendants)
+ return result;
+
+ for (auto& child : childrenOfType<Element>(*this)) {
+ bool includesFixedPosition = false;
+ LayoutRect childBounds = child.absoluteEventBoundsOfElementAndDescendants(includesFixedPosition);
+ includesFixedPositionElements |= includesFixedPosition;
+ result.unite(childBounds);
+ }
+
+ return result;
+}
+
+LayoutRect Element::absoluteEventHandlerBounds(bool& includesFixedPositionElements)
+{
+ // This is not web-exposed, so don't call the FOUC-inducing updateLayoutIgnorePendingStylesheets().
+ FrameView* frameView = document().view();
+ if (!frameView)
+ return LayoutRect();
+
+ if (frameView->needsLayout())
+ frameView->layout();
+
+ return absoluteEventBoundsOfElementAndDescendants(includesFixedPositionElements);
+}
+
</ins><span class="cx"> Ref<ClientRectList> Element::getClientRects()
</span><span class="cx"> {
</span><span class="cx"> document().updateLayoutIgnorePendingStylesheets();
</span></span></pre></div>
<a id="trunkSourceWebCoredomElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Element.h (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Element.h 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/dom/Element.h 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -484,6 +484,8 @@
</span><span class="cx"> virtual void didDetachRenderers();
</span><span class="cx"> virtual RefPtr<RenderStyle> customStyleForRenderer(RenderStyle& parentStyle);
</span><span class="cx">
</span><ins>+ LayoutRect absoluteEventHandlerBounds(bool& includesFixedPositionElements) override;
+
</ins><span class="cx"> void setBeforePseudoElement(Ref<PseudoElement>&&);
</span><span class="cx"> void setAfterPseudoElement(Ref<PseudoElement>&&);
</span><span class="cx"> void clearBeforePseudoElement();
</span><span class="lines">@@ -562,6 +564,9 @@
</span><span class="cx"> void addAttributeInternal(const QualifiedName&, const AtomicString& value, SynchronizationOfLazyAttribute);
</span><span class="cx"> void removeAttributeInternal(unsigned index, SynchronizationOfLazyAttribute);
</span><span class="cx">
</span><ins>+ LayoutRect absoluteEventBounds(bool& boundsIncludeAllDescendantElements, bool& includesFixedPositionElements);
+ LayoutRect absoluteEventBoundsOfElementAndDescendants(bool& includesFixedPositionElements);
+
</ins><span class="cx"> #if ENABLE(TREE_DEBUGGING)
</span><span class="cx"> virtual void formatForDebugger(char* buffer, unsigned length) const override;
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCorepageDebugPageOverlayscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/DebugPageOverlays.cpp (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/page/DebugPageOverlays.cpp 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -90,16 +90,8 @@
</span><span class="cx">
</span><span class="cx"> bool MouseWheelRegionOverlay::updateRegion()
</span><span class="cx"> {
</span><del>- std::unique_ptr<Region> region = std::make_unique<Region>();
</del><ins>+ std::unique_ptr<Region> region = std::make_unique<Region>(m_frame.document()->absoluteRegionForEventTargets(m_frame.document()->wheelEventTargets()));
</ins><span class="cx">
</span><del>- for (auto& element : descendantsOfType<Element>(*m_frame.document())) {
- if (element.hasEventListeners(eventNames().mousewheelEvent) || element.hasEventListeners(eventNames().wheelEvent)) {
- IntRect elementRect = element.boundsInRootViewSpace();
- elementRect = m_frame.view()->rootViewToContents(elementRect);
- region->unite(Region(elementRect));
- }
- }
-
</del><span class="cx"> bool regionChanged = !m_region || !(*m_region == *region);
</span><span class="cx"> m_region = WTF::move(region);
</span><span class="cx"> return regionChanged;
</span></span></pre></div>
<a id="trunkSourceWebCorepagescrollingScrollingCoordinatorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/page/scrolling/ScrollingCoordinator.cpp 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -98,6 +98,10 @@
</span><span class="cx">
</span><span class="cx"> Region ScrollingCoordinator::computeNonFastScrollableRegion(const Frame& frame, const IntPoint& frameLocation) const
</span><span class="cx"> {
</span><ins>+ RenderView* renderView = frame.contentRenderer();
+ if (!renderView || renderView->documentBeingDestroyed())
+ return Region();
+
</ins><span class="cx"> #if ENABLE(IOS_TOUCH_EVENTS)
</span><span class="cx"> // On iOS, we use nonFastScrollableRegion to represent the region covered by elements with touch event handlers.
</span><span class="cx"> ASSERT(frame.isMainFrame());
</span><span class="lines">@@ -114,6 +118,7 @@
</span><span class="cx"> for (const auto& rect : touchRects)
</span><span class="cx"> touchRegion.unite(rect);
</span><span class="cx">
</span><ins>+ // FIXME: use absoluteRegionForEventTargets().
</ins><span class="cx"> return touchRegion;
</span><span class="cx"> #else
</span><span class="cx"> Region nonFastScrollableRegion;
</span><span class="lines">@@ -148,6 +153,11 @@
</span><span class="cx"> for (Frame* subframe = frame.tree().firstChild(); subframe; subframe = subframe->tree().nextSibling())
</span><span class="cx"> nonFastScrollableRegion.unite(computeNonFastScrollableRegion(*subframe, offset));
</span><span class="cx">
</span><ins>+ // Include wheel event handler region for the main frame.
+ Region wheelHandlerRegion = frame.document()->absoluteRegionForEventTargets(frame.document()->wheelEventTargets());
+ wheelHandlerRegion.translate(toIntSize(offset));
+ nonFastScrollableRegion.unite(wheelHandlerRegion);
+
</ins><span class="cx"> return nonFastScrollableRegion;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -48,6 +48,7 @@
</span><span class="cx"> #include "BoxShape.h"
</span><span class="cx"> #include "CSSPropertyNames.h"
</span><span class="cx"> #include "Chrome.h"
</span><ins>+#include "DebugPageOverlays.h"
</ins><span class="cx"> #include "Document.h"
</span><span class="cx"> #include "DocumentEventQueue.h"
</span><span class="cx"> #include "Element.h"
</span><span class="lines">@@ -2391,6 +2392,7 @@
</span><span class="cx"> #if PLATFORM(IOS) && ENABLE(TOUCH_EVENTS)
</span><span class="cx"> renderer().document().dirtyTouchEventRects();
</span><span class="cx"> #endif
</span><ins>+ DebugPageOverlays::didLayout(renderer().frame());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Frame& frame = renderer().frame();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.cpp (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.cpp 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/rendering/RenderObject.cpp 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -1085,11 +1085,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-IntRect RenderObject::absoluteBoundingBoxRect(bool useTransforms) const
</del><ins>+IntRect RenderObject::absoluteBoundingBoxRect(bool useTransforms, bool* wasFixed) const
</ins><span class="cx"> {
</span><span class="cx"> if (useTransforms) {
</span><span class="cx"> Vector<FloatQuad> quads;
</span><del>- absoluteQuads(quads);
</del><ins>+ absoluteQuads(quads, wasFixed);
</ins><span class="cx">
</span><span class="cx"> size_t n = quads.size();
</span><span class="cx"> if (!n)
</span><span class="lines">@@ -1101,7 +1101,7 @@
</span><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- FloatPoint absPos = localToAbsolute();
</del><ins>+ FloatPoint absPos = localToAbsolute(FloatPoint(), 0 /* ignore transforms */, wasFixed);
</ins><span class="cx"> Vector<IntRect> rects;
</span><span class="cx"> absoluteRects(rects, flooredLayoutPoint(absPos));
</span><span class="cx">
</span><span class="lines">@@ -1579,10 +1579,10 @@
</span><span class="cx"> selectionRoot().selectionData().selectionStartEndPositions(spos, epos);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-FloatPoint RenderObject::localToAbsolute(const FloatPoint& localPoint, MapCoordinatesFlags mode) const
</del><ins>+FloatPoint RenderObject::localToAbsolute(const FloatPoint& localPoint, MapCoordinatesFlags mode, bool* wasFixed) const
</ins><span class="cx"> {
</span><span class="cx"> TransformState transformState(TransformState::ApplyTransformDirection, localPoint);
</span><del>- mapLocalToContainer(nullptr, transformState, mode | ApplyContainerFlip);
</del><ins>+ mapLocalToContainer(nullptr, transformState, mode | ApplyContainerFlip, wasFixed);
</ins><span class="cx"> transformState.flatten();
</span><span class="cx">
</span><span class="cx"> return transformState.lastPlanarPoint();
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderObjecth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderObject.h (182214 => 182215)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderObject.h 2015-03-31 23:38:49 UTC (rev 182214)
+++ trunk/Source/WebCore/rendering/RenderObject.h 2015-03-31 23:42:31 UTC (rev 182215)
</span><span class="lines">@@ -652,7 +652,7 @@
</span><span class="cx"> RenderBlock* containingBlock() const;
</span><span class="cx">
</span><span class="cx"> // Convert the given local point to absolute coordinates. If MapCoordinatesFlags includes UseTransforms, take transforms into account.
</span><del>- WEBCORE_EXPORT FloatPoint localToAbsolute(const FloatPoint& localPoint = FloatPoint(), MapCoordinatesFlags = 0) const;
</del><ins>+ WEBCORE_EXPORT FloatPoint localToAbsolute(const FloatPoint& localPoint = FloatPoint(), MapCoordinatesFlags = 0, bool* wasFixed = nullptr) const;
</ins><span class="cx"> FloatPoint absoluteToLocal(const FloatPoint&, MapCoordinatesFlags = 0) const;
</span><span class="cx">
</span><span class="cx"> // Convert a local quad to absolute coordinates, taking transforms into account.
</span><span class="lines">@@ -681,7 +681,7 @@
</span><span class="cx"> virtual void absoluteRects(Vector<IntRect>&, const LayoutPoint&) const { }
</span><span class="cx">
</span><span class="cx"> // FIXME: useTransforms should go away eventually
</span><del>- WEBCORE_EXPORT IntRect absoluteBoundingBoxRect(bool useTransform = true) const;
</del><ins>+ WEBCORE_EXPORT IntRect absoluteBoundingBoxRect(bool useTransform = true, bool* wasFixed = nullptr) const;
</ins><span class="cx"> IntRect absoluteBoundingBoxRectIgnoringTransforms() const { return absoluteBoundingBoxRect(false); }
</span><span class="cx">
</span><span class="cx"> // Build an array of quads in absolute coords for line boxes
</span></span></pre>
</div>
</div>
</body>
</html>