Added: trunk/LayoutTests/platform/mac/fast/scrolling/scroll-div-no-latching.html (0 => 167648)
--- trunk/LayoutTests/platform/mac/fast/scrolling/scroll-div-no-latching.html (rev 0)
+++ trunk/LayoutTests/platform/mac/fast/scrolling/scroll-div-no-latching.html 2014-04-22 03:59:06 UTC (rev 167648)
@@ -0,0 +1,115 @@
+<!DOCTYPE html>
+<html>
+<head>
+<style>
+body {
+ height: 1200px;
+}
+
+.post {
+ width: 500px;
+ height: 600px;
+ overflow: auto;
+ border: 1px solid black;
+}
+
+.content {
+ width: 1000px;
+ height: 100%;
+ background-image: repeating-linear-gradient(rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2) 100px), repeating-linear-gradient(to right, rgba(0, 0, 0, 0), rgba(0, 0, 0, 0.2) 100px);
+
+}
+</style>
+<script src=""
+<script>
+function onLoad() {
+ setupTopLevel();
+}
+</script>
+</head>
+<body _onload_="onLoad();">
+<script>
+
+var divTarget;
+var pageScrollPositionBefore;
+var divScrollPositionBefore;
+var continueCount = 5;
+
+function checkForScroll() {
+ var pageScrollPositionAfter = document.body.scrollTop;
+ var divScrollPositionAfter = divTarget.scrollLeft;
+
+ //debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
+ //debug("Page after: " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
+
+ if (pageScrollPositionBefore != pageScrollPositionAfter)
+ testPassed("Page received wheel events.");
+ else
+ testFailed("Page did not receive wheel events.");
+
+ testRunner.notifyDone();
+}
+
+function scrollTest() {
+ // See where our IFrame lives:
+ pageScrollPositionBefore = document.body.scrollTop;
+
+ divTarget = document.getElementById('parent');
+
+ divScrollPositionBefore = divTarget.scrollLeft;
+
+ var startPosX = divTarget.offsetLeft + 20;
+ //debug("div display height = " + divTarget.clientHeight);
+ var startPosY = divTarget.offsetTop + (divTarget.clientHeight / 2); // One wheel turn before end.
+ eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
+ //debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
+
+ //debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 1, 'none', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 1, 'none', 'none', true);
+
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(-1, 0, 'none', 'none', true);
+
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'none', true);
+ eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'none', true);
+
+ setTimeout(checkForScroll, 100);
+}
+
+function setupTopLevel() {
+
+ if (window.eventSender) {
+ testRunner.waitUntilDone();
+
+ setTimeout(scrollTest, 1000);
+ } else {
+ var messageLocation = document.getElementById('parent');
+ var message = document.createElement('div');
+ message.innerHTML = "<p>This test is better run under DumpRenderTree. To manually test it, place the mouse pointer<br/>"
+ + "inside the textured region. (1) Use the mouse wheel to scroll vertically, then (2) hold the shift key while<br/>"
+ + "moving the mouse wheel to scroll horizontally, then (3) release the shift key and attempt to scroll vertically.<br/><br/>"
+ + "The final set of vertical moves should modify the parent page scroll position.</p>";
+ messageLocation.appendChild(message);
+ }
+}
+
+</script>
+ <div id="parent" class="post">
+ <div id="target" class="content">
+ Test region.
+ </div>
+ </div>
+</div>
+<div id="console"></div>
+<script>
+description("Tests that scroll events of type 'none' work properly.");
+</script>
+<script src=""
+</body>
+</html>
Modified: trunk/Source/WebCore/page/EventHandler.cpp (167647 => 167648)
--- trunk/Source/WebCore/page/EventHandler.cpp 2014-04-22 03:26:22 UTC (rev 167647)
+++ trunk/Source/WebCore/page/EventHandler.cpp 2014-04-22 03:59:06 UTC (rev 167648)
@@ -2576,6 +2576,11 @@
ScrollableArea* scrollableArea = nullptr;
platformPrepareForWheelEvents(e, result, element, scrollableContainer, scrollableArea, isOverWidget);
+ if (!e.useLatchedEventElement()) {
+ m_latchedWheelEventElement = nullptr;
+ m_previousWheelScrolledElement = nullptr;
+ }
+
// FIXME: It should not be necessary to do this mutation here.
// Instead, the handlers should know convert vertical scrolls
// appropriately.
