Unreviewed, rolling out r164073 and r164080.
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Feb 2014 01:44:07 +0000 (01:44 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 14 Feb 2014 01:44:07 +0000 (01:44 +0000)
http://trac.webkit.org/changeset/164073
http://trac.webkit.org/changeset/164080
https://bugs.webkit.org/show_bug.cgi?id=128781

Broke Mac builds (Requested by rniwa on #webkit).

Patch by Commit Queue <commit-queue@webkit.org> on 2014-02-13

Tools:

* DumpRenderTree/mac/EventSendingController.mm:
(+[EventSendingController isSelectorExcludedFromWebScript:]):
(+[EventSendingController webScriptNameForSelector:]):
* WebKitTestRunner/EventSenderProxy.h:
* WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:
* WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
* WebKitTestRunner/InjectedBundle/EventSendingController.h:
* WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm:
* WebKitTestRunner/TestController.cpp:
(WTR::TestController::didReceiveMessageFromInjectedBundle):
(WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
* WebKitTestRunner/efl/EventSenderProxyEfl.cpp:
* WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
* WebKitTestRunner/mac/EventSenderProxy.mm:

LayoutTests:

* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html: Removed.
* platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html: Removed.
* platform/mac/fast/scrolling/scroll-div-latched-div-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-div-latched-div.html: Removed.
* platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-div-latched-mainframe.html: Removed.
* platform/mac/fast/scrolling/scroll-iframe-latched-iframe-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-iframe-latched-iframe.html: Removed.
* platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-iframe-latched-mainframe.html: Removed.
* platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-select-latched-mainframe.html: Removed.
* platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt: Removed.
* platform/mac/fast/scrolling/scroll-select-latched-select.html: Removed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@164081 268f45cc-cd09-0410-ab3c-d52691b4dbfc

48 files changed:
LayoutTests/ChangeLog
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html [deleted file]
LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-div-expected.txt [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-div.html [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe.html [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-iframe-expected.txt [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-iframe.html [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe.html [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe.html [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt [deleted file]
LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select.html [deleted file]
Tools/ChangeLog
Tools/DumpRenderTree/mac/EventSendingController.mm
Tools/WebKitTestRunner/EventSenderProxy.h
Tools/WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl
Tools/WebKitTestRunner/InjectedBundle/EventSendingController.cpp
Tools/WebKitTestRunner/InjectedBundle/EventSendingController.h
Tools/WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm
Tools/WebKitTestRunner/TestController.cpp
Tools/WebKitTestRunner/efl/EventSenderProxyEfl.cpp
Tools/WebKitTestRunner/gtk/EventSenderProxyGtk.cpp
Tools/WebKitTestRunner/mac/EventSenderProxy.mm

index 789c3c0..f634724 100644 (file)
@@ -1,3 +1,49 @@
+2014-02-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r164073 and r164080.
+        http://trac.webkit.org/changeset/164073
+        http://trac.webkit.org/changeset/164080
+        https://bugs.webkit.org/show_bug.cgi?id=128781
+
+        Broke Mac builds (Requested by rniwa on #webkit).
+
+        * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html: Removed.
+        * platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html: Removed.
+        * platform/mac/fast/scrolling/scroll-div-latched-div-expected.txt: Removed.
+        * platform/mac/fast/scrolling/scroll-div-latched-div.html: Removed.
+        * platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt: Removed.
+        * platform/mac/fast/scrolling/scroll-div-latched-mainframe.html: Removed.
+        * platform/mac/fast/scrolling/scroll-iframe-latched-iframe-expected.txt: Removed.
+        * platform/mac/fast/scrolling/scroll-iframe-latched-iframe.html: Removed.
+        * platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt: Removed.
+        * platform/mac/fast/scrolling/scroll-iframe-latched-mainframe.html: Removed.
+        * platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt: Removed.
+        * platform/mac/fast/scrolling/scroll-select-latched-mainframe.html: Removed.
+        * platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt: Removed.
+        * platform/mac/fast/scrolling/scroll-select-latched-select.html: Removed.
+
 2014-02-13  Myles C. Maxfield  <mmaxfield@apple.com>
 
         text-decoration-skip: ink skips randomly when using SVG fonts
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-expected.txt
deleted file mode 100644 (file)
index 2871f64..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Region
-
-Count  DATA    Rev Count
-TOP TOP TOP TOP TOP    TOP TOP TOP TOP TOP     TOP TOP TOP TOP TOP
-1      0.1100  40
-2      0.1155  39
-3      0.2200  38
-4      0.2255  37
-5      0.3300  36
-6      0.3355  35
-7      0.4400  34
-8      0.4455  33
-9      0.5500  32
-10     0.5555  31
-11     0.6600  30
-12     0.6655  29
-13     0.7700  28
-14     0.7755  27
-15     0.8800  26
-16     0.8855  25
-17     0.9900  24
-18     0.9955  23
-19     0.9999  22
-20     1.0000  21
-21     1.0000  20
-22     0.9999  19
-23     0.9955  18
-24     0.9900  17
-25     0.8855  16
-26     0.8800  15
-27     0.7755  14
-28     0.7700  13
-29     0.6655  12
-30     0.6600  11
-31     0.5555  10
-32     0.5500  9
-33     0.4455  8
-34     0.4400  7
-35     0.3355  6
-36     0.3300  5
-37     0.2255  4
-38     0.2200  3
-39     0.1155  2
-40     0.1100  1
-END END END END END    END END END END END     END END END END END
-Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 485
-Mouse moved to (28, 610)
-Page before: 0, div before: 451
-Page after:  0, div after: 451
-PASS Page did not receive wheel events.
-(GraphicsLayer
-  (bounds 2008.00 2326.00)
-  (visible rect 0.00, 0.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2008.00 2326.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 2008 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 4 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler-expected.txt
deleted file mode 100644 (file)
index bb1a0f8..0000000
+++ /dev/null
@@ -1,77 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Region
-
-Count  DATA    Rev Count
-TOP TOP TOP TOP TOP    TOP TOP TOP TOP TOP     TOP TOP TOP TOP TOP
-1      0.1100  40
-2      0.1155  39
-3      0.2200  38
-4      0.2255  37
-5      0.3300  36
-6      0.3355  35
-7      0.4400  34
-8      0.4455  33
-9      0.5500  32
-10     0.5555  31
-11     0.6600  30
-12     0.6655  29
-13     0.7700  28
-14     0.7755  27
-15     0.8800  26
-16     0.8855  25
-17     0.9900  24
-18     0.9955  23
-19     0.9999  22
-20     1.0000  21
-21     1.0000  20
-22     0.9999  19
-23     0.9955  18
-24     0.9900  17
-25     0.8855  16
-26     0.8800  15
-27     0.7755  14
-28     0.7700  13
-29     0.6655  12
-30     0.6600  11
-31     0.5555  10
-32     0.5500  9
-33     0.4455  8
-34     0.4400  7
-35     0.3355  6
-36     0.3300  5
-37     0.2255  4
-38     0.2200  3
-39     0.1155  2
-40     0.1100  1
-END END END END END    END END END END END     END END END END END
-Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 485
-Mouse moved to (28, 610)
-Page before: 0, div before: 451
-Page after:  0, div after: 451
-PASS Page did not receive wheel events.
-Document was initial target for 0 of the wheel events.
-(GraphicsLayer
-  (bounds 2008.00 2341.00)
-  (visible rect 0.00, 0.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2008.00 2341.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 2008 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 4 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div-with-handler.html
deleted file mode 100644 (file)
index 00baf89..0000000
+++ /dev/null
@@ -1,182 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
-    wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
-    document.addEventListener("mousewheel", onScrollWheel);
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The div should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var divScrollPositionAfter = divTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    divTarget = document.getElementById('target');
-    divTarget.scrollTop = divTarget.scrollHeight - divTarget.clientHeight - 100;
-
-    divScrollPositionBefore = divTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = divTarget.offsetLeft + 20;
-    debug("div display height = " + divTarget.clientHeight);
-    var startPosY = divTarget.offsetTop + divTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the div.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-    <div class="scrollable_region">
-        <h3>Scrollable Region</h3>
-        <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
-            <table class="table" style='width: 99%'>
-                <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
-                <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
-                <tr><td>1</td><td>0.1100</td><td>40</td></tr>
-                <tr><td>2</td><td>0.1155</td><td>39</td></tr>
-                <tr><td>3</td><td>0.2200</td><td>38</td></tr>
-                <tr><td>4</td><td>0.2255</td><td>37</td></tr>
-                <tr><td>5</td><td>0.3300</td><td>36</td></tr>
-                <tr><td>6</td><td>0.3355</td><td>35</td></tr>
-                <tr><td>7</td><td>0.4400</td><td>34</td></tr>
-                <tr><td>8</td><td>0.4455</td><td>33</td></tr>
-                <tr><td>9</td><td>0.5500</td><td>32</td></tr>
-                <tr><td>10</td><td>0.5555</td><td>31</td></tr>
-                <tr><td>11</td><td>0.6600</td><td>30</td></tr>
-                <tr><td>12</td><td>0.6655</td><td>29</td></tr>
-                <tr><td>13</td><td>0.7700</td><td>28</td></tr>
-                <tr><td>14</td><td>0.7755</td><td>27</td></tr>
-                <tr><td>15</td><td>0.8800</td><td>26</td></tr>
-                <tr><td>16</td><td>0.8855</td><td>25</td></tr>
-                <tr><td>17</td><td>0.9900</td><td>24</td></tr>
-                <tr><td>18</td><td>0.9955</td><td>23</td></tr>
-                <tr><td>19</td><td>0.9999</td><td>22</td></tr>
-                <tr><td>20</td><td>1.0000</td><td>21</td></tr>
-                <tr><td>21</td><td>1.0000</td><td>20</td></tr>
-                <tr><td>22</td><td>0.9999</td><td>19</td></tr>
-                <tr><td>23</td><td>0.9955</td><td>18</td></tr>
-                <tr><td>24</td><td>0.9900</td><td>17</td></tr>
-                <tr><td>25</td><td>0.8855</td><td>16</td></tr>
-                <tr><td>26</td><td>0.8800</td><td>15</td></tr>
-                <tr><td>27</td><td>0.7755</td><td>14</td></tr>
-                <tr><td>28</td><td>0.7700</td><td>13</td></tr>
-                <tr><td>29</td><td>0.6655</td><td>12</td></tr>
-                <tr><td>30</td><td>0.6600</td><td>11</td></tr>
-                <tr><td>31</td><td>0.5555</td><td>10</td></tr>
-                <tr><td>32</td><td>0.5500</td><td>9</td></tr>
-                <tr><td>33</td><td>0.4455</td><td>8</td></tr>
-                <tr><td>34</td><td>0.4400</td><td>7</td></tr>
-                <tr><td>35</td><td>0.3355</td><td>6</td></tr>
-                <tr><td>36</td><td>0.3300</td><td>5</td></tr>
-                <tr><td>37</td><td>0.2255</td><td>4</td></tr>
-                <tr><td>38</td><td>0.2200</td><td>3</td></tr>
-                <tr><td>39</td><td>0.1155</td><td>2</td></tr>
-                <tr><td>40</td><td>0.1100</td><td>1</td></tr>
-                <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
-            </table>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-div.html
deleted file mode 100644 (file)
index 6f23c70..0000000
+++ /dev/null
@@ -1,174 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The div should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var divScrollPositionAfter = divTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    divTarget = document.getElementById('target');
-    divTarget.scrollTop = divTarget.scrollHeight - divTarget.clientHeight - 100;
-
-    divScrollPositionBefore = divTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = divTarget.offsetLeft + 20;
-    debug("div display height = " + divTarget.clientHeight);
-    var startPosY = divTarget.offsetTop + divTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the div.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-    <div class="scrollable_region">
-        <h3>Scrollable Region</h3>
-        <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
-            <table class="table" style='width: 99%'>
-                <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
-                <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
-                <tr><td>1</td><td>0.1100</td><td>40</td></tr>
-                <tr><td>2</td><td>0.1155</td><td>39</td></tr>
-                <tr><td>3</td><td>0.2200</td><td>38</td></tr>
-                <tr><td>4</td><td>0.2255</td><td>37</td></tr>
-                <tr><td>5</td><td>0.3300</td><td>36</td></tr>
-                <tr><td>6</td><td>0.3355</td><td>35</td></tr>
-                <tr><td>7</td><td>0.4400</td><td>34</td></tr>
-                <tr><td>8</td><td>0.4455</td><td>33</td></tr>
-                <tr><td>9</td><td>0.5500</td><td>32</td></tr>
-                <tr><td>10</td><td>0.5555</td><td>31</td></tr>
-                <tr><td>11</td><td>0.6600</td><td>30</td></tr>
-                <tr><td>12</td><td>0.6655</td><td>29</td></tr>
-                <tr><td>13</td><td>0.7700</td><td>28</td></tr>
-                <tr><td>14</td><td>0.7755</td><td>27</td></tr>
-                <tr><td>15</td><td>0.8800</td><td>26</td></tr>
-                <tr><td>16</td><td>0.8855</td><td>25</td></tr>
-                <tr><td>17</td><td>0.9900</td><td>24</td></tr>
-                <tr><td>18</td><td>0.9955</td><td>23</td></tr>
-                <tr><td>19</td><td>0.9999</td><td>22</td></tr>
-                <tr><td>20</td><td>1.0000</td><td>21</td></tr>
-                <tr><td>21</td><td>1.0000</td><td>20</td></tr>
-                <tr><td>22</td><td>0.9999</td><td>19</td></tr>
-                <tr><td>23</td><td>0.9955</td><td>18</td></tr>
-                <tr><td>24</td><td>0.9900</td><td>17</td></tr>
-                <tr><td>25</td><td>0.8855</td><td>16</td></tr>
-                <tr><td>26</td><td>0.8800</td><td>15</td></tr>
-                <tr><td>27</td><td>0.7755</td><td>14</td></tr>
-                <tr><td>28</td><td>0.7700</td><td>13</td></tr>
-                <tr><td>29</td><td>0.6655</td><td>12</td></tr>
-                <tr><td>30</td><td>0.6600</td><td>11</td></tr>
-                <tr><td>31</td><td>0.5555</td><td>10</td></tr>
-                <tr><td>32</td><td>0.5500</td><td>9</td></tr>
-                <tr><td>33</td><td>0.4455</td><td>8</td></tr>
-                <tr><td>34</td><td>0.4400</td><td>7</td></tr>
-                <tr><td>35</td><td>0.3355</td><td>6</td></tr>
-                <tr><td>36</td><td>0.3300</td><td>5</td></tr>
-                <tr><td>37</td><td>0.2255</td><td>4</td></tr>
-                <tr><td>38</td><td>0.2200</td><td>3</td></tr>
-                <tr><td>39</td><td>0.1155</td><td>2</td></tr>
-                <tr><td>40</td><td>0.1100</td><td>1</td></tr>
-                <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
-            </table>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-expected.txt
deleted file mode 100644 (file)
index 091c212..0000000
+++ /dev/null
@@ -1,75 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Region
-
-Count  DATA    Rev Count
-TOP TOP TOP TOP TOP    TOP TOP TOP TOP TOP     TOP TOP TOP TOP TOP
-1      0.1100  40
-2      0.1155  39
-3      0.2200  38
-4      0.2255  37
-5      0.3300  36
-6      0.3355  35
-7      0.4400  34
-8      0.4455  33
-9      0.5500  32
-10     0.5555  31
-11     0.6600  30
-12     0.6655  29
-13     0.7700  28
-14     0.7755  27
-15     0.8800  26
-16     0.8855  25
-17     0.9900  24
-18     0.9955  23
-19     0.9999  22
-20     1.0000  21
-21     1.0000  20
-22     0.9999  19
-23     0.9955  18
-24     0.9900  17
-25     0.8855  16
-26     0.8800  15
-27     0.7755  14
-28     0.7700  13
-29     0.6655  12
-30     0.6600  11
-31     0.5555  10
-32     0.5500  9
-33     0.4455  8
-34     0.4400  7
-35     0.3355  6
-36     0.3300  5
-37     0.2255  4
-38     0.2200  3
-39     0.1155  2
-40     0.1100  1
-END END END END END    END END END END END     END END END END END
-Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 125)
-Page before: 0, div before: 0
-Page after:  280, div after: 0
-PASS Scrollable div did not receive wheel events.
-(GraphicsLayer
-  (bounds 2008.00 2311.00)
-  (visible rect 0.00, 280.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2008.00 2311.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 280.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 2008 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 4 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler-expected.txt
deleted file mode 100644 (file)
index 5b0210e..0000000
+++ /dev/null
@@ -1,76 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Region
-
-Count  DATA    Rev Count
-TOP TOP TOP TOP TOP    TOP TOP TOP TOP TOP     TOP TOP TOP TOP TOP
-1      0.1100  40
-2      0.1155  39
-3      0.2200  38
-4      0.2255  37
-5      0.3300  36
-6      0.3355  35
-7      0.4400  34
-8      0.4455  33
-9      0.5500  32
-10     0.5555  31
-11     0.6600  30
-12     0.6655  29
-13     0.7700  28
-14     0.7755  27
-15     0.8800  26
-16     0.8855  25
-17     0.9900  24
-18     0.9955  23
-19     0.9999  22
-20     1.0000  21
-21     1.0000  20
-22     0.9999  19
-23     0.9955  18
-24     0.9900  17
-25     0.8855  16
-26     0.8800  15
-27     0.7755  14
-28     0.7700  13
-29     0.6655  12
-30     0.6600  11
-31     0.5555  10
-32     0.5500  9
-33     0.4455  8
-34     0.4400  7
-35     0.3355  6
-36     0.3300  5
-37     0.2255  4
-38     0.2200  3
-39     0.1155  2
-40     0.1100  1
-END END END END END    END END END END END     END END END END END
-Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 125)
-Page before: 0, div before: 0
-Page after:  280, div after: 0
-PASS Scrollable div did not receive wheel events.
-Document was initial target for 4 of the wheel events.
-(GraphicsLayer
-  (bounds 2008.00 2326.00)
-  (visible rect 0.00, 280.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2008.00 2326.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 280.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 2008 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 4 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe-with-handler.html
deleted file mode 100644 (file)
index 47ac6e1..0000000
+++ /dev/null
@@ -1,180 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
-    wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
-    document.addEventListener("mousewheel", onScrollWheel);
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The div should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var divScrollPositionAfter = divTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
-    if (divScrollPositionBefore != divScrollPositionAfter)
-        testFailed("Scrollable div consumed wheel events.");
-    else
-        testPassed("Scrollable div did not receive wheel events.");
-
-    debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    divTarget = document.getElementById('target');
-
-    divScrollPositionBefore = divTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = divTarget.offsetLeft + 20;
-    var startPosY = divTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the div.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-    <div class="scrollable_region">
-        <h3>Scrollable Region</h3>
-        <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
-            <table class="table" style='width: 99%'>
-                <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
-                <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
-                <tr><td>1</td><td>0.1100</td><td>40</td></tr>
-                <tr><td>2</td><td>0.1155</td><td>39</td></tr>
-                <tr><td>3</td><td>0.2200</td><td>38</td></tr>
-                <tr><td>4</td><td>0.2255</td><td>37</td></tr>
-                <tr><td>5</td><td>0.3300</td><td>36</td></tr>
-                <tr><td>6</td><td>0.3355</td><td>35</td></tr>
-                <tr><td>7</td><td>0.4400</td><td>34</td></tr>
-                <tr><td>8</td><td>0.4455</td><td>33</td></tr>
-                <tr><td>9</td><td>0.5500</td><td>32</td></tr>
-                <tr><td>10</td><td>0.5555</td><td>31</td></tr>
-                <tr><td>11</td><td>0.6600</td><td>30</td></tr>
-                <tr><td>12</td><td>0.6655</td><td>29</td></tr>
-                <tr><td>13</td><td>0.7700</td><td>28</td></tr>
-                <tr><td>14</td><td>0.7755</td><td>27</td></tr>
-                <tr><td>15</td><td>0.8800</td><td>26</td></tr>
-                <tr><td>16</td><td>0.8855</td><td>25</td></tr>
-                <tr><td>17</td><td>0.9900</td><td>24</td></tr>
-                <tr><td>18</td><td>0.9955</td><td>23</td></tr>
-                <tr><td>19</td><td>0.9999</td><td>22</td></tr>
-                <tr><td>20</td><td>1.0000</td><td>21</td></tr>
-                <tr><td>21</td><td>1.0000</td><td>20</td></tr>
-                <tr><td>22</td><td>0.9999</td><td>19</td></tr>
-                <tr><td>23</td><td>0.9955</td><td>18</td></tr>
-                <tr><td>24</td><td>0.9900</td><td>17</td></tr>
-                <tr><td>25</td><td>0.8855</td><td>16</td></tr>
-                <tr><td>26</td><td>0.8800</td><td>15</td></tr>
-                <tr><td>27</td><td>0.7755</td><td>14</td></tr>
-                <tr><td>28</td><td>0.7700</td><td>13</td></tr>
-                <tr><td>29</td><td>0.6655</td><td>12</td></tr>
-                <tr><td>30</td><td>0.6600</td><td>11</td></tr>
-                <tr><td>31</td><td>0.5555</td><td>10</td></tr>
-                <tr><td>32</td><td>0.5500</td><td>9</td></tr>
-                <tr><td>33</td><td>0.4455</td><td>8</td></tr>
-                <tr><td>34</td><td>0.4400</td><td>7</td></tr>
-                <tr><td>35</td><td>0.3355</td><td>6</td></tr>
-                <tr><td>36</td><td>0.3300</td><td>5</td></tr>
-                <tr><td>37</td><td>0.2255</td><td>4</td></tr>
-                <tr><td>38</td><td>0.2200</td><td>3</td></tr>
-                <tr><td>39</td><td>0.1155</td><td>2</td></tr>
-                <tr><td>40</td><td>0.1100</td><td>1</td></tr>
-                <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
-            </table>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-div-latched-mainframe.html
deleted file mode 100644 (file)
index c0136e3..0000000
+++ /dev/null
@@ -1,172 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The div should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var divScrollPositionAfter = divTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
-    if (divScrollPositionBefore != divScrollPositionAfter)
-        testFailed("Scrollable div consumed wheel events.");
-    else
-        testPassed("Scrollable div did not receive wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    divTarget = document.getElementById('target');
-
-    divScrollPositionBefore = divTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = divTarget.offsetLeft + 20;
-    var startPosY = divTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the div.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-    <div class="scrollable_region">
-        <h3>Scrollable Region</h3>
-        <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
-            <table class="table" style='width: 99%'>
-                <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
-                <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
-                <tr><td>1</td><td>0.1100</td><td>40</td></tr>
-                <tr><td>2</td><td>0.1155</td><td>39</td></tr>
-                <tr><td>3</td><td>0.2200</td><td>38</td></tr>
-                <tr><td>4</td><td>0.2255</td><td>37</td></tr>
-                <tr><td>5</td><td>0.3300</td><td>36</td></tr>
-                <tr><td>6</td><td>0.3355</td><td>35</td></tr>
-                <tr><td>7</td><td>0.4400</td><td>34</td></tr>
-                <tr><td>8</td><td>0.4455</td><td>33</td></tr>
-                <tr><td>9</td><td>0.5500</td><td>32</td></tr>
-                <tr><td>10</td><td>0.5555</td><td>31</td></tr>
-                <tr><td>11</td><td>0.6600</td><td>30</td></tr>
-                <tr><td>12</td><td>0.6655</td><td>29</td></tr>
-                <tr><td>13</td><td>0.7700</td><td>28</td></tr>
-                <tr><td>14</td><td>0.7755</td><td>27</td></tr>
-                <tr><td>15</td><td>0.8800</td><td>26</td></tr>
-                <tr><td>16</td><td>0.8855</td><td>25</td></tr>
-                <tr><td>17</td><td>0.9900</td><td>24</td></tr>
-                <tr><td>18</td><td>0.9955</td><td>23</td></tr>
-                <tr><td>19</td><td>0.9999</td><td>22</td></tr>
-                <tr><td>20</td><td>1.0000</td><td>21</td></tr>
-                <tr><td>21</td><td>1.0000</td><td>20</td></tr>
-                <tr><td>22</td><td>0.9999</td><td>19</td></tr>
-                <tr><td>23</td><td>0.9955</td><td>18</td></tr>
-                <tr><td>24</td><td>0.9900</td><td>17</td></tr>
-                <tr><td>25</td><td>0.8855</td><td>16</td></tr>
-                <tr><td>26</td><td>0.8800</td><td>15</td></tr>
-                <tr><td>27</td><td>0.7755</td><td>14</td></tr>
-                <tr><td>28</td><td>0.7700</td><td>13</td></tr>
-                <tr><td>29</td><td>0.6655</td><td>12</td></tr>
-                <tr><td>30</td><td>0.6600</td><td>11</td></tr>
-                <tr><td>31</td><td>0.5555</td><td>10</td></tr>
-                <tr><td>32</td><td>0.5500</td><td>9</td></tr>
-                <tr><td>33</td><td>0.4455</td><td>8</td></tr>
-                <tr><td>34</td><td>0.4400</td><td>7</td></tr>
-                <tr><td>35</td><td>0.3355</td><td>6</td></tr>
-                <tr><td>36</td><td>0.3300</td><td>5</td></tr>
-                <tr><td>37</td><td>0.2255</td><td>4</td></tr>
-                <tr><td>38</td><td>0.2200</td><td>3</td></tr>
-                <tr><td>39</td><td>0.1155</td><td>2</td></tr>
-                <tr><td>40</td><td>0.1100</td><td>1</td></tr>
-                <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
-            </table>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-expected.txt
deleted file mode 100644 (file)
index 8d7a08f..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-Put mouse here and flick downwards
-
-Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-IFrame display height = 500
-Mouse moved to (28, 566)
-Page before: 0, IFrame before: 416
-Page after:  0, IFrame after: 531
-PASS Page did not receive wheel events.
-(GraphicsLayer
-  (bounds 785.00 2326.00)
-  (visible rect 0.00, 0.00 785.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 785.00 2326.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 600.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 785 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 2 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler-expected.txt
deleted file mode 100644 (file)
index 08775b9..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-Put mouse here and flick downwards
-
-Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-IFrame display height = 500
-Mouse moved to (28, 566)
-Page before: 0, IFrame before: 416
-Page after:  0, IFrame after: 531
-PASS Page did not receive wheel events.
-Document was initial target for 0 of the wheel events.
-(GraphicsLayer
-  (bounds 785.00 2341.00)
-  (visible rect 0.00, 0.00 785.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 785.00 2341.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 600.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 785 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 2 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe-with-handler.html
deleted file mode 100644 (file)
index 4212f5a..0000000
+++ /dev/null
@@ -1,126 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
-    wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
-    document.addEventListener("mousewheel", onScrollWheel);
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The IFrame should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    iframeTarget = document.getElementById('target');
-
-    var iFrameBody = window.frames['target'].document.body;
-    iFrameBody.scrollTop = iFrameBody.scrollHeight - iframeTarget.clientHeight - 100;
-
-    iFrameScrollPositionBefore = iFrameBody.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = iframeTarget.offsetLeft + 20;
-    debug("IFrame display height = " + iframeTarget.clientHeight);
-    var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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 IFrame, then use the mouse wheel or a two-finger swipe to scroll the IFrame to the bottom (and beyond).<br/>"
-            + "<br/><br/>"
-            + "The test passes if you scroll far enough to see the row of END labels but the main page does not scroll.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
-    <div id="source" style="height: 100px">
-        Put mouse here and flick downwards
-    </div>
-    <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;" 
-     src= "data:text/html,
-     <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
-     TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
-     This should still be visible inside the frame after you scroll down
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     This should NOT be visible inside the frame after you scroll down<br/>
-     <br/>
-     END END END END END END END END END END END END END
-     </div>
-     "
-     onload="setupTopLevel();"
-     >
-    </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-iframe.html
deleted file mode 100644 (file)
index 6856fa2..0000000
+++ /dev/null
@@ -1,114 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The IFrame should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    iframeTarget = document.getElementById('target');
-
-    var iFrameBody = window.frames['target'].document.body;
-    iFrameBody.scrollTop = iFrameBody.scrollHeight - iframeTarget.clientHeight - 100;
-
-    iFrameScrollPositionBefore = iFrameBody.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = iframeTarget.offsetLeft + 20;
-    debug("IFrame display height = " + iframeTarget.clientHeight);
-    var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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 IFrame, then use the mouse wheel or a two-finger swipe to scroll the IFrame to the bottom (and beyond).<br/>"
-            + "<br/><br/>"
-            + "The test passes if you scroll far enough to see the row of END labels but the main page does not scroll.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
-    <div id="source" style="height: 100px">
-        Put mouse here and flick downwards
-    </div>
-    <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;" 
-     src= "data:text/html,
-     <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
-     TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
-     This should still be visible inside the frame after you scroll down
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     This should NOT be visible inside the frame after you scroll down<br/>
-     <br/>
-     END END END END END END END END END END END END END
-     </div>
-     "
-     onload="setupTopLevel();"
-     >
-    </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-expected.txt
deleted file mode 100644 (file)
index 525497a..0000000
+++ /dev/null
@@ -1,31 +0,0 @@
-Put mouse here and flick downwards
-
-Tests that iframe doesn't consume wheel events when scroll
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 66)
-Page before: 0, IFrame before: 0
-Page after:  280, IFrame after: 0
-PASS IFrame did not receive wheel events.
-(GraphicsLayer
-  (bounds 785.00 2311.00)
-  (visible rect 0.00, 280.00 785.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 785.00 2311.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 280.00 785.00 x 600.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 785 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 2 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler-expected.txt
deleted file mode 100644 (file)
index aa76bb4..0000000
+++ /dev/null
@@ -1,32 +0,0 @@
-Put mouse here and flick downwards
-
-Tests that iframe doesn't consume wheel events when scroll
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 66)
-Page before: 0, IFrame before: 0
-Page after:  280, IFrame after: 0
-PASS IFrame did not receive wheel events.
-Document was initial target for 4 of the wheel events.
-(GraphicsLayer
-  (bounds 785.00 2326.00)
-  (visible rect 0.00, 280.00 785.00 x 600.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 785.00 2326.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 280.00 785.00 x 600.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 785 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 2 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe-with-handler.html
deleted file mode 100644 (file)
index 89b47a7..0000000
+++ /dev/null
@@ -1,121 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
-    wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
-    document.addEventListener("mousewheel", onScrollWheel);
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The IFrame should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
-    if (iFrameScrollPositionBefore != iFrameScrollPositionAfter)
-        testFailed("IFrame consumed wheel events.");
-    else
-        testPassed("IFrame did not receive wheel events.");
-
-    debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-    iFrameScrollPositionBefore = window.frames['target'].document.body.scrollTop;
-
-    iframeTarget = document.getElementById('target');
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = iframeTarget.offsetLeft + 20;
-    var startPosY = iframeTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the IFrame.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
-    <div id="source" style="height: 100px">
-        Put mouse here and flick downwards
-    </div>
-    <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;" 
-     src= "data:text/html,
-     <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
-     TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
-     This should still be visible inside the frame after you scroll down
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     This should NOT be visible inside the frame after you scroll down<br/>
-     <br/>
-     END END END END END END END END END END END END END
-     </div>
-     "
-     onload="setupTopLevel();"
-     >
-    </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't consume wheel events when scroll ");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-iframe-latched-mainframe.html
deleted file mode 100644 (file)
index 1dbd20a..0000000
+++ /dev/null
@@ -1,109 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The IFrame should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
-    if (iFrameScrollPositionBefore != iFrameScrollPositionAfter)
-        testFailed("IFrame consumed wheel events.");
-    else
-        testPassed("IFrame did not receive wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-    iFrameScrollPositionBefore = window.frames['target'].document.body.scrollTop;
-
-    iframeTarget = document.getElementById('target');
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = iframeTarget.offsetLeft + 20;
-    var startPosY = iframeTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the IFrame.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
-    <div id="source" style="height: 100px">
-        Put mouse here and flick downwards
-    </div>
-    <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;" 
-     src= "data:text/html,
-     <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
-     TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
-     This should still be visible inside the frame after you scroll down
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     This should NOT be visible inside the frame after you scroll down<br/>
-     <br/>
-     END END END END END END END END END END END END END
-     </div>
-     "
-     onload="setupTopLevel();"
-     >
-    </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't consume wheel events when scroll ");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-expected.txt
deleted file mode 100644 (file)
index d5d72ac..0000000
+++ /dev/null
@@ -1,33 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (30, 127)
-Page before: 0, select before: 0
-Page after:  280, select after: 0
-PASS Select did not receive wheel events.
-(GraphicsLayer
-  (bounds 2008.00 2311.00)
-  (visible rect 0.00, 280.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2008.00 2311.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 280.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 2008 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 4 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler-expected.txt
deleted file mode 100644 (file)
index d07bf50..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (30, 127)
-Page before: 0, select before: 0
-Page after:  280, select after: 0
-PASS Select did not receive wheel events.
-Document was initial target for 4 of the wheel events.
-(GraphicsLayer
-  (bounds 2008.00 2326.00)
-  (visible rect 0.00, 280.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2008.00 2326.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 280.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 2008 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 4 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe-with-handler.html
deleted file mode 100644 (file)
index e97f257..0000000
+++ /dev/null
@@ -1,157 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
-    wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
-    document.addEventListener("mousewheel", onScrollWheel);
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The select should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var selectScrollPositionAfter = selectTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
-    if (selectScrollPositionBefore != selectScrollPositionAfter)
-        testFailed("Select consumed wheel events.");
-    else
-        testPassed("Select did not receive wheel events.");
-
-    debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    selectTarget = document.getElementById('target');
-
-    selectScrollPositionBefore = selectTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = selectTarget.offsetLeft + 20;
-    var startPosY = selectTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll down<br/>"
-            + "past the selectTarget.<br/><br/>"
-            + "You should not see the 'content21' label if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-        <div class="scrollable_region">
-            <h3>Scrollable Select</h3>
-            <select id="target" class="scrollable_select" size="8">
-                <option>content1</option>
-                <option>content2</option>
-                <option>content3</option>
-                <option>content4</option>
-                <option>content5</option>
-                <option>content6</option>
-                <option>content7</option>
-                <option>content8</option>
-                <option>content9</option>
-                <option>content10</option>
-                <option>content11</option>
-                <option>content12</option>
-                <option>content13</option>
-                <option>content14</option>
-                <option>content15</option>
-                <option>content16</option>
-                <option>content17</option>
-                <option>content18</option>
-                <option>content19</option>
-                <option>content20</option>
-                <option>content21</option>
-            </select>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-mainframe.html
deleted file mode 100644 (file)
index c1064b6..0000000
+++ /dev/null
@@ -1,149 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The select should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var selectScrollPositionAfter = selectTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
-    if (selectScrollPositionBefore != selectScrollPositionAfter)
-        testFailed("Select consumed wheel events.");
-    else
-        testPassed("Select did not receive wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    selectTarget = document.getElementById('target');
-
-    selectScrollPositionBefore = selectTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = selectTarget.offsetLeft + 20;
-    var startPosY = selectTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll down<br/>"
-            + "past the selectTarget.<br/><br/>"
-            + "You should not see the 'content21' label if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-        <div class="scrollable_region">
-            <h3>Scrollable Select</h3>
-            <select id="target" class="scrollable_select" size="8">
-                <option>content1</option>
-                <option>content2</option>
-                <option>content3</option>
-                <option>content4</option>
-                <option>content5</option>
-                <option>content6</option>
-                <option>content7</option>
-                <option>content8</option>
-                <option>content9</option>
-                <option>content10</option>
-                <option>content11</option>
-                <option>content12</option>
-                <option>content13</option>
-                <option>content14</option>
-                <option>content15</option>
-                <option>content16</option>
-                <option>content17</option>
-                <option>content18</option>
-                <option>content19</option>
-                <option>content20</option>
-                <option>content21</option>
-            </select>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-expected.txt
deleted file mode 100644 (file)
index e48747b..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 111
-Mouse moved to (30, 238)
-Page before: 0, select before: 70
-Page after:  0, select after: 182
-PASS Page did not receive wheel events.
-(GraphicsLayer
-  (bounds 2008.00 2326.00)
-  (visible rect 0.00, 0.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2008.00 2326.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 2008 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 4 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler-expected.txt
deleted file mode 100644 (file)
index 46b224d..0000000
+++ /dev/null
@@ -1,35 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 111
-Mouse moved to (30, 238)
-Page before: 0, select before: 70
-Page after:  0, select after: 182
-PASS Page did not receive wheel events.
-Document was initial target for 4 of the wheel events.
-(GraphicsLayer
-  (bounds 2008.00 2341.00)
-  (visible rect 0.00, 0.00 785.00 x 585.00)
-  (contentsScale 1.00)
-  (children 1
-    (GraphicsLayer
-      (bounds 2008.00 2341.00)
-      (contentsOpaque 1)
-      (visible rect 0.00, 0.00 785.00 x 585.00)
-      (contentsScale 1.00)
-      (tile cache coverage 0, 0 2008 x 2048)
-      (tile size 512 x 512)
-      (top left tile 0, 0 tiles grid 4 x 4)
-    )
-  )
-)
-
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select-with-handler.html
deleted file mode 100644 (file)
index f450898..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-var wheelCount = 0;
-function onScrollWheel(evt) {
-    wheelCount = wheelCount + 1;
-}
-
-function onLoad() {
-    document.addEventListener("mousewheel", onScrollWheel);
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The page should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var selectScrollPositionAfter = selectTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    debug("Document was initial target for " + wheelCount + " of the wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    selectTarget = document.getElementById('target');
-    selectTarget.scrollTop = selectTarget.scrollHeight - selectTarget.clientHeight - 100;
-
-    selectScrollPositionBefore = selectTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = selectTarget.offsetLeft + 20;
-    debug("div display height = " + selectTarget.clientHeight);
-    var startPosY = selectTarget.offsetTop + selectTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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 select box, and scroll near (but not AT) the bottom of the range. Use the mouse wheel or a two-finger<br/>"
-            + "swipe to scroll through the rest of the select options.<br/><br/>"
-            + "You should not see the page position change if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-        <div class="scrollable_region">
-            <h3>Scrollable Select</h3>
-            <select id="target" class="scrollable_select" size="8">
-                <option>content1</option>
-                <option>content2</option>
-                <option>content3</option>
-                <option>content4</option>
-                <option>content5</option>
-                <option>content6</option>
-                <option>content7</option>
-                <option>content8</option>
-                <option>content9</option>
-                <option>content10</option>
-                <option>content11</option>
-                <option>content12</option>
-                <option>content13</option>
-                <option>content14</option>
-                <option>content15</option>
-                <option>content16</option>
-                <option>content17</option>
-                <option>content18</option>
-                <option>content19</option>
-                <option>content20</option>
-                <option>content21</option>
-            </select>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html b/LayoutTests/platform/mac-wk2/tiled-drawing/fast-scroll-select-latched-select.html
deleted file mode 100644 (file)
index d8df89b..0000000
+++ /dev/null
@@ -1,151 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The page should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var selectScrollPositionAfter = selectTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    if (window.internals) {
-        document.getElementById('layers').innerText = internals.layerTreeAsText(document,
-            internals.LAYER_TREE_INCLUDES_VISIBLE_RECTS | internals.LAYER_TREE_INCLUDES_TILE_CACHES);
-    }
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    selectTarget = document.getElementById('target');
-    selectTarget.scrollTop = selectTarget.scrollHeight - selectTarget.clientHeight - 100;
-
-    selectScrollPositionBefore = selectTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = selectTarget.offsetLeft + 20;
-    debug("div display height = " + selectTarget.clientHeight);
-    var startPosY = selectTarget.offsetTop + selectTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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 select box, and scroll near (but not AT) the bottom of the range. Use the mouse wheel or a two-finger<br/>"
-            + "swipe to scroll through the rest of the select options.<br/><br/>"
-            + "You should not see the page position change if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-        <div class="scrollable_region">
-            <h3>Scrollable Select</h3>
-            <select id="target" class="scrollable_select" size="8">
-                <option>content1</option>
-                <option>content2</option>
-                <option>content3</option>
-                <option>content4</option>
-                <option>content5</option>
-                <option>content6</option>
-                <option>content7</option>
-                <option>content8</option>
-                <option>content9</option>
-                <option>content10</option>
-                <option>content11</option>
-                <option>content12</option>
-                <option>content13</option>
-                <option>content14</option>
-                <option>content15</option>
-                <option>content16</option>
-                <option>content17</option>
-                <option>content18</option>
-                <option>content19</option>
-                <option>content20</option>
-                <option>content21</option>
-            </select>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<pre id="layers">Layer tree goes here</p>
-<script src="../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-div-expected.txt b/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-div-expected.txt
deleted file mode 100644 (file)
index e4249d3..0000000
+++ /dev/null
@@ -1,60 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Region
-
-Count  DATA    Rev Count
-TOP TOP TOP TOP TOP    TOP TOP TOP TOP TOP     TOP TOP TOP TOP TOP
-1      0.1100  40
-2      0.1155  39
-3      0.2200  38
-4      0.2255  37
-5      0.3300  36
-6      0.3355  35
-7      0.4400  34
-8      0.4455  33
-9      0.5500  32
-10     0.5555  31
-11     0.6600  30
-12     0.6655  29
-13     0.7700  28
-14     0.7755  27
-15     0.8800  26
-16     0.8855  25
-17     0.9900  24
-18     0.9955  23
-19     0.9999  22
-20     1.0000  21
-21     1.0000  20
-22     0.9999  19
-23     0.9955  18
-24     0.9900  17
-25     0.8855  16
-26     0.8800  15
-27     0.7755  14
-28     0.7700  13
-29     0.6655  12
-30     0.6600  11
-31     0.5555  10
-32     0.5500  9
-33     0.4455  8
-34     0.4400  7
-35     0.3355  6
-36     0.3300  5
-37     0.2255  4
-38     0.2200  3
-39     0.1155  2
-40     0.1100  1
-END END END END END    END END END END END     END END END END END
-Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 485
-Mouse moved to (28, 610)
-Page before: 0, div before: 451
-Page after:  0, div after: 451
-PASS Page did not receive wheel events.
-
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-div.html b/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-div.html
deleted file mode 100644 (file)
index 8704797..0000000
+++ /dev/null
@@ -1,168 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The div should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var divScrollPositionAfter = divTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    divTarget = document.getElementById('target');
-    divTarget.scrollTop = divTarget.scrollHeight - divTarget.clientHeight - 100;
-
-    divScrollPositionBefore = divTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = divTarget.offsetLeft + 20;
-    debug("div display height = " + divTarget.clientHeight);
-    var startPosY = divTarget.offsetTop + divTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the div.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-    <div class="scrollable_region">
-        <h3>Scrollable Region</h3>
-        <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
-            <table class="table" style='width: 99%'>
-                <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
-                <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
-                <tr><td>1</td><td>0.1100</td><td>40</td></tr>
-                <tr><td>2</td><td>0.1155</td><td>39</td></tr>
-                <tr><td>3</td><td>0.2200</td><td>38</td></tr>
-                <tr><td>4</td><td>0.2255</td><td>37</td></tr>
-                <tr><td>5</td><td>0.3300</td><td>36</td></tr>
-                <tr><td>6</td><td>0.3355</td><td>35</td></tr>
-                <tr><td>7</td><td>0.4400</td><td>34</td></tr>
-                <tr><td>8</td><td>0.4455</td><td>33</td></tr>
-                <tr><td>9</td><td>0.5500</td><td>32</td></tr>
-                <tr><td>10</td><td>0.5555</td><td>31</td></tr>
-                <tr><td>11</td><td>0.6600</td><td>30</td></tr>
-                <tr><td>12</td><td>0.6655</td><td>29</td></tr>
-                <tr><td>13</td><td>0.7700</td><td>28</td></tr>
-                <tr><td>14</td><td>0.7755</td><td>27</td></tr>
-                <tr><td>15</td><td>0.8800</td><td>26</td></tr>
-                <tr><td>16</td><td>0.8855</td><td>25</td></tr>
-                <tr><td>17</td><td>0.9900</td><td>24</td></tr>
-                <tr><td>18</td><td>0.9955</td><td>23</td></tr>
-                <tr><td>19</td><td>0.9999</td><td>22</td></tr>
-                <tr><td>20</td><td>1.0000</td><td>21</td></tr>
-                <tr><td>21</td><td>1.0000</td><td>20</td></tr>
-                <tr><td>22</td><td>0.9999</td><td>19</td></tr>
-                <tr><td>23</td><td>0.9955</td><td>18</td></tr>
-                <tr><td>24</td><td>0.9900</td><td>17</td></tr>
-                <tr><td>25</td><td>0.8855</td><td>16</td></tr>
-                <tr><td>26</td><td>0.8800</td><td>15</td></tr>
-                <tr><td>27</td><td>0.7755</td><td>14</td></tr>
-                <tr><td>28</td><td>0.7700</td><td>13</td></tr>
-                <tr><td>29</td><td>0.6655</td><td>12</td></tr>
-                <tr><td>30</td><td>0.6600</td><td>11</td></tr>
-                <tr><td>31</td><td>0.5555</td><td>10</td></tr>
-                <tr><td>32</td><td>0.5500</td><td>9</td></tr>
-                <tr><td>33</td><td>0.4455</td><td>8</td></tr>
-                <tr><td>34</td><td>0.4400</td><td>7</td></tr>
-                <tr><td>35</td><td>0.3355</td><td>6</td></tr>
-                <tr><td>36</td><td>0.3300</td><td>5</td></tr>
-                <tr><td>37</td><td>0.2255</td><td>4</td></tr>
-                <tr><td>38</td><td>0.2200</td><td>3</td></tr>
-                <tr><td>39</td><td>0.1155</td><td>2</td></tr>
-                <tr><td>40</td><td>0.1100</td><td>1</td></tr>
-                <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
-            </table>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<script src="../../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt b/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe-expected.txt
deleted file mode 100644 (file)
index 4df6c44..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Region
-
-Count  DATA    Rev Count
-TOP TOP TOP TOP TOP    TOP TOP TOP TOP TOP     TOP TOP TOP TOP TOP
-1      0.1100  40
-2      0.1155  39
-3      0.2200  38
-4      0.2255  37
-5      0.3300  36
-6      0.3355  35
-7      0.4400  34
-8      0.4455  33
-9      0.5500  32
-10     0.5555  31
-11     0.6600  30
-12     0.6655  29
-13     0.7700  28
-14     0.7755  27
-15     0.8800  26
-16     0.8855  25
-17     0.9900  24
-18     0.9955  23
-19     0.9999  22
-20     1.0000  21
-21     1.0000  20
-22     0.9999  19
-23     0.9955  18
-24     0.9900  17
-25     0.8855  16
-26     0.8800  15
-27     0.7755  14
-28     0.7700  13
-29     0.6655  12
-30     0.6600  11
-31     0.5555  10
-32     0.5500  9
-33     0.4455  8
-34     0.4400  7
-35     0.3355  6
-36     0.3300  5
-37     0.2255  4
-38     0.2200  3
-39     0.1155  2
-40     0.1100  1
-END END END END END    END END END END END     END END END END END
-Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 125)
-Page before: 0, div before: 0
-Page after:  320, div after: 0
-PASS Scrollable div did not receive wheel events.
-
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe.html b/LayoutTests/platform/mac/fast/scrolling/scroll-div-latched-mainframe.html
deleted file mode 100644 (file)
index c611ad1..0000000
+++ /dev/null
@@ -1,166 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var divTarget;
-var pageScrollPositionBefore;
-var divScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The div should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var divScrollPositionAfter = divTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", div before: " + divScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", div after: " + divScrollPositionAfter);
-
-    if (divScrollPositionBefore != divScrollPositionAfter)
-        testFailed("Scrollable div consumed wheel events.");
-    else
-        testPassed("Scrollable div did not receive wheel events.");
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    divTarget = document.getElementById('target');
-
-    divScrollPositionBefore = divTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = divTarget.offsetLeft + 20;
-    var startPosY = divTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the div.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-    <div class="scrollable_region">
-        <h3>Scrollable Region</h3>
-        <div id="target" style='overflow-y: auto; overflow-x: hidden; max-height: 485px;'>
-            <table class="table" style='width: 99%'>
-                <tr><th>Count</th><th>DATA</th><th>Rev Count</th></tr>
-                <tr><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td><td>TOP TOP TOP TOP TOP</td></tr>
-                <tr><td>1</td><td>0.1100</td><td>40</td></tr>
-                <tr><td>2</td><td>0.1155</td><td>39</td></tr>
-                <tr><td>3</td><td>0.2200</td><td>38</td></tr>
-                <tr><td>4</td><td>0.2255</td><td>37</td></tr>
-                <tr><td>5</td><td>0.3300</td><td>36</td></tr>
-                <tr><td>6</td><td>0.3355</td><td>35</td></tr>
-                <tr><td>7</td><td>0.4400</td><td>34</td></tr>
-                <tr><td>8</td><td>0.4455</td><td>33</td></tr>
-                <tr><td>9</td><td>0.5500</td><td>32</td></tr>
-                <tr><td>10</td><td>0.5555</td><td>31</td></tr>
-                <tr><td>11</td><td>0.6600</td><td>30</td></tr>
-                <tr><td>12</td><td>0.6655</td><td>29</td></tr>
-                <tr><td>13</td><td>0.7700</td><td>28</td></tr>
-                <tr><td>14</td><td>0.7755</td><td>27</td></tr>
-                <tr><td>15</td><td>0.8800</td><td>26</td></tr>
-                <tr><td>16</td><td>0.8855</td><td>25</td></tr>
-                <tr><td>17</td><td>0.9900</td><td>24</td></tr>
-                <tr><td>18</td><td>0.9955</td><td>23</td></tr>
-                <tr><td>19</td><td>0.9999</td><td>22</td></tr>
-                <tr><td>20</td><td>1.0000</td><td>21</td></tr>
-                <tr><td>21</td><td>1.0000</td><td>20</td></tr>
-                <tr><td>22</td><td>0.9999</td><td>19</td></tr>
-                <tr><td>23</td><td>0.9955</td><td>18</td></tr>
-                <tr><td>24</td><td>0.9900</td><td>17</td></tr>
-                <tr><td>25</td><td>0.8855</td><td>16</td></tr>
-                <tr><td>26</td><td>0.8800</td><td>15</td></tr>
-                <tr><td>27</td><td>0.7755</td><td>14</td></tr>
-                <tr><td>28</td><td>0.7700</td><td>13</td></tr>
-                <tr><td>29</td><td>0.6655</td><td>12</td></tr>
-                <tr><td>30</td><td>0.6600</td><td>11</td></tr>
-                <tr><td>31</td><td>0.5555</td><td>10</td></tr>
-                <tr><td>32</td><td>0.5500</td><td>9</td></tr>
-                <tr><td>33</td><td>0.4455</td><td>8</td></tr>
-                <tr><td>34</td><td>0.4400</td><td>7</td></tr>
-                <tr><td>35</td><td>0.3355</td><td>6</td></tr>
-                <tr><td>36</td><td>0.3300</td><td>5</td></tr>
-                <tr><td>37</td><td>0.2255</td><td>4</td></tr>
-                <tr><td>38</td><td>0.2200</td><td>3</td></tr>
-                <tr><td>39</td><td>0.1155</td><td>2</td></tr>
-                <tr><td>40</td><td>0.1100</td><td>1</td></tr>
-                <tr><td>END END END END END</td><td>END END END END END</td><td>END END END END END</td></tr>
-            </table>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a scrollable div doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<script src="../../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-iframe-expected.txt b/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-iframe-expected.txt
deleted file mode 100644 (file)
index 493f2f4..0000000
+++ /dev/null
@@ -1,16 +0,0 @@
-Put mouse here and flick downwards
-
-Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-IFrame display height = 500
-Mouse moved to (28, 566)
-Page before: 0, IFrame before: 416
-Page after:  0, IFrame after: 416
-PASS Page did not receive wheel events.
-
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-iframe.html b/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-iframe.html
deleted file mode 100644 (file)
index 2d86f2b..0000000
+++ /dev/null
@@ -1,108 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The IFrame should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    iframeTarget = document.getElementById('target');
-
-    var iFrameBody = window.frames['target'].document.body;
-    iFrameBody.scrollTop = iFrameBody.scrollHeight - iframeTarget.clientHeight - 100;
-
-    iFrameScrollPositionBefore = iFrameBody.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = iframeTarget.offsetLeft + 20;
-    debug("IFrame display height = " + iframeTarget.clientHeight);
-    var startPosY = iframeTarget.offsetTop + iframeTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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 IFrame, then use the mouse wheel or a two-finger swipe to scroll the IFrame to the bottom (and beyond).<br/>"
-            + "<br/><br/>"
-            + "The test passes if you scroll far enough to see the row of END labels but the main page does not scroll.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
-    <div id="source" style="height: 100px">
-        Put mouse here and flick downwards
-    </div>
-    <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;" 
-     src= "data:text/html,
-     <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
-     TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
-     This should still be visible inside the frame after you scroll down
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     This should NOT be visible inside the frame after you scroll down<br/>
-     <br/>
-     END END END END END END END END END END END END END
-     </div>
-     "
-     onload="setupTopLevel();"
-     >
-    </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<script src="../../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt b/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe-expected.txt
deleted file mode 100644 (file)
index 8c66525..0000000
+++ /dev/null
@@ -1,15 +0,0 @@
-Put mouse here and flick downwards
-
-Tests that iframe doesn't consume wheel events when scroll
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (28, 66)
-Page before: 0, IFrame before: 0
-Page after:  320, IFrame after: 0
-PASS IFrame did not receive wheel events.
-
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe.html b/LayoutTests/platform/mac/fast/scrolling/scroll-iframe-latched-mainframe.html
deleted file mode 100644 (file)
index 0206519..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="help" href="http://www.w3.org/TR/DOM-Level-3-Events/#events-WheelEvent">
-<script src="../../../../resources/js-test-pre.js"></script>
-</head>
-<body>
-<script>
-
-var iframeTarget;
-var pageScrollPositionBefore;
-var iFrameScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The IFrame should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var iFrameScrollPositionAfter = window.frames['target'].document.body.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", IFrame before: " + iFrameScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", IFrame after: " + iFrameScrollPositionAfter);
-
-    if (iFrameScrollPositionBefore != iFrameScrollPositionAfter)
-        testFailed("IFrame consumed wheel events.");
-    else
-        testPassed("IFrame did not receive wheel events.");
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-    iFrameScrollPositionBefore = window.frames['target'].document.body.scrollTop;
-
-    iframeTarget = document.getElementById('target');
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = iframeTarget.offsetLeft + 20;
-    var startPosY = iframeTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll the<br/>"
-            + "down past the IFrame.<br/><br/>"
-            + "You should not see the row of END labels if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px">
-    <div id="source" style="height: 100px">
-        Put mouse here and flick downwards
-    </div>
-    <iframe id="target" name="target" style="border:solid 1px green; height: 500px; width: 500px;" 
-     src= "data:text/html,
-     <div id='notToBeScrolled' style='height: 1000px; width: 1000px;'>
-     TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP TOP<br/><br/>
-     This should still be visible inside the frame after you scroll down
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     <br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/><br/>
-     This should NOT be visible inside the frame after you scroll down<br/>
-     <br/>
-     END END END END END END END END END END END END END
-     </div>
-     "
-     onload="setupTopLevel();"
-     >
-    </iframe>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that iframe doesn't consume wheel events when scroll ");
-</script>
-<script src="../../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt b/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe-expected.txt
deleted file mode 100644 (file)
index ebcd7d5..0000000
+++ /dev/null
@@ -1,17 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't consume wheel events when scroll is latched to main frame.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-Mouse moved to (30, 127)
-Page before: 0, select before: 0
-Page after:  320, select after: 0
-PASS Select did not receive wheel events.
-
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe.html b/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-mainframe.html
deleted file mode 100644 (file)
index 97d6841..0000000
+++ /dev/null
@@ -1,143 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The select should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var selectScrollPositionAfter = selectTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
-    if (selectScrollPositionBefore != selectScrollPositionAfter)
-        testFailed("Select consumed wheel events.");
-    else
-        testPassed("Select did not receive wheel events.");
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    selectTarget = document.getElementById('target');
-
-    selectScrollPositionBefore = selectTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = selectTarget.offsetLeft + 20;
-    var startPosY = selectTarget.offsetTop - 42; // Slightly more than one wheel scroll away from the IFrame
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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/>"
-            + "at the top of the page, and then use the mouse wheel or a two-finger swipe to scroll down<br/>"
-            + "past the selectTarget.<br/><br/>"
-            + "You should not see the 'content21' label if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-        <div class="scrollable_region">
-            <h3>Scrollable Select</h3>
-            <select id="target" class="scrollable_select" size="8">
-                <option>content1</option>
-                <option>content2</option>
-                <option>content3</option>
-                <option>content4</option>
-                <option>content5</option>
-                <option>content6</option>
-                <option>content7</option>
-                <option>content8</option>
-                <option>content9</option>
-                <option>content10</option>
-                <option>content11</option>
-                <option>content12</option>
-                <option>content13</option>
-                <option>content14</option>
-                <option>content15</option>
-                <option>content16</option>
-                <option>content17</option>
-                <option>content18</option>
-                <option>content19</option>
-                <option>content20</option>
-                <option>content21</option>
-            </select>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't consume wheel events when scroll is latched to main frame.");
-</script>
-<script src="../../../../resources/js-test-post.js"></script>
-</body>
-</html>
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt b/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select-expected.txt
deleted file mode 100644 (file)
index 59cd29e..0000000
+++ /dev/null
@@ -1,18 +0,0 @@
-Put mouse here and flick downwards
-Scrollable Select
-
-
-Tests that a select doesn't pass wheel events to main frame when scrolling at bottom
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-PASS successfullyParsed is true
-
-TEST COMPLETE
-div display height = 111
-Mouse moved to (30, 238)
-Page before: 0, select before: 70
-Page after:  0, select after: 182
-PASS Page did not receive wheel events.
-
diff --git a/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select.html b/LayoutTests/platform/mac/fast/scrolling/scroll-select-latched-select.html
deleted file mode 100644 (file)
index 396d2d5..0000000
+++ /dev/null
@@ -1,145 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<style>
-.scrollable_region {
-    width: 680px;
-}
-
-.table td, .table th {
-    padding: 2px;
-}
-
-.table th {
-    height: 20px;
-    text-align: left;
-    font-weight: strong;
-}
-
-.table tr:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-.scrollable_select option:nth-child(odd) {
-    background: #f3f3f3;
-}
-
-</style>
-<script src="../../../../resources/js-test-pre.js"></script>
-<script>
-function onLoad() {
-    setupTopLevel();
-}
-</script>
-</head>
-<body onload="onLoad();">
-<script>
-
-var selectTarget;
-var pageScrollPositionBefore;
-var selectScrollPositionBefore;
-var continueCount = 5;
-
-function checkForScroll() {
-
-    // The page should not have scrolled at all.
-    var pageScrollPositionAfter = document.body.scrollTop;
-    var selectScrollPositionAfter = selectTarget.scrollTop;
-
-    debug("Page before: " + pageScrollPositionBefore + ", select before: " + selectScrollPositionBefore);
-    debug("Page after:  " + pageScrollPositionAfter + ", select after: " + selectScrollPositionAfter);
-
-    if (pageScrollPositionBefore != pageScrollPositionAfter)
-        testFailed("Page received wheel events.");
-    else
-        testPassed("Page did not receive wheel events.");
-
-    testRunner.notifyDone();
-}
-
-function scrollTest() {
-    // See where our IFrame lives:
-    pageScrollPositionBefore = document.body.scrollTop;
-
-    selectTarget = document.getElementById('target');
-    selectTarget.scrollTop = selectTarget.scrollHeight - selectTarget.clientHeight - 100;
-
-    selectScrollPositionBefore = selectTarget.scrollTop;
-
-    // Scroll the #source until we reach the #target.
-    var startPosX = selectTarget.offsetLeft + 20;
-    debug("div display height = " + selectTarget.clientHeight);
-    var startPosY = selectTarget.offsetTop + selectTarget.clientHeight - 42; // One wheel turn before end.
-    eventSender.mouseMoveTo(startPosX, startPosY); // Make sure we are just outside the iFrame
-    debug("Mouse moved to (" + startPosX + ", " + startPosY + ")");
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'began', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'changed', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'ended', 'none', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'begin', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, -1, 'none', 'continue', true);
-    eventSender.mouseScrollByWithWheelAndMomentumPhases(0, 0, 'none', 'end', true);
-    setTimeout(checkForScroll, 100);
-}
-
-function setupTopLevel() {
-
-    if (window.eventSender) {
-        testRunner.dumpAsText(true);
-        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 select box, and scroll near (but not AT) the bottom of the range. Use the mouse wheel or a two-finger<br/>"
-            + "swipe to scroll through the rest of the select options.<br/><br/>"
-            + "You should not see the page position change if this test is successful.</p>";
-        messageLocation.appendChild(message);
-    }
-}
-
-</script>
-<div id="parent" style="height: 2000px; width: 2000px;">
-    <div id="source" style="height: 100px; width: 500px;">
-        Put mouse here and flick downwards
-    </div>
-        <div class="scrollable_region">
-            <h3>Scrollable Select</h3>
-            <select id="target" class="scrollable_select" size="8">
-                <option>content1</option>
-                <option>content2</option>
-                <option>content3</option>
-                <option>content4</option>
-                <option>content5</option>
-                <option>content6</option>
-                <option>content7</option>
-                <option>content8</option>
-                <option>content9</option>
-                <option>content10</option>
-                <option>content11</option>
-                <option>content12</option>
-                <option>content13</option>
-                <option>content14</option>
-                <option>content15</option>
-                <option>content16</option>
-                <option>content17</option>
-                <option>content18</option>
-                <option>content19</option>
-                <option>content20</option>
-                <option>content21</option>
-            </select>
-        </div>
-    </div>
-</div>
-<div id="console"></div>
-<script>
-description("Tests that a select doesn't pass wheel events to main frame when scrolling at bottom");
-</script>
-<script src="../../../../resources/js-test-post.js"></script>
-</body>
-</html>
index bdb28cb..a27b520 100644 (file)
@@ -1,3 +1,27 @@
+2014-02-13  Commit Queue  <commit-queue@webkit.org>
+
+        Unreviewed, rolling out r164073 and r164080.
+        http://trac.webkit.org/changeset/164073
+        http://trac.webkit.org/changeset/164080
+        https://bugs.webkit.org/show_bug.cgi?id=128781
+
+        Broke Mac builds (Requested by rniwa on #webkit).
+
+        * DumpRenderTree/mac/EventSendingController.mm:
+        (+[EventSendingController isSelectorExcludedFromWebScript:]):
+        (+[EventSendingController webScriptNameForSelector:]):
+        * WebKitTestRunner/EventSenderProxy.h:
+        * WebKitTestRunner/InjectedBundle/Bindings/EventSendingController.idl:
+        * WebKitTestRunner/InjectedBundle/EventSendingController.cpp:
+        * WebKitTestRunner/InjectedBundle/EventSendingController.h:
+        * WebKitTestRunner/InjectedBundle/ios/EventSenderProxyIOS.mm:
+        * WebKitTestRunner/TestController.cpp:
+        (WTR::TestController::didReceiveMessageFromInjectedBundle):
+        (WTR::TestController::didReceiveSynchronousMessageFromInjectedBundle):
+        * WebKitTestRunner/efl/EventSenderProxyEfl.cpp:
+        * WebKitTestRunner/gtk/EventSenderProxyGtk.cpp:
+        * WebKitTestRunner/mac/EventSenderProxy.mm:
+
 2014-02-13  Brent Fulgham  <bfulgham@apple.com>
 
         Unreviewed build fix for Mountain Lion.
index 4be480e..5674e89 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005, 2006, 2007, 2008, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2005, 2006, 2007, 2008 Apple Inc. All rights reserved.
  * Copyright (C) 2006 Jonas Witt <jonas.witt@gmail.com>
  * Copyright (C) 2006 Samuel Weinig <sam.weinig@gmail.com>
  * Copyright (C) 2006 Alexey Proskuryakov <ap@nypop.com>
@@ -74,7 +74,6 @@ enum MouseButton {
     NoMouseButton = -1
 };
 
-
 struct KeyMappingEntry {
     int macKeyCode;
     int macNumpadKeyCode;
@@ -203,7 +202,6 @@ BOOL replayingSavedEvents;
             || aSelector == @selector(zoomPageOut)
             || aSelector == @selector(scalePageBy:atX:andY:)
             || aSelector == @selector(mouseScrollByX:andY:)
-            || aSelector == @selector(mouseScrollByX:andY:withWheel:andMomentumPhases:)
             || aSelector == @selector(continuousMouseScrollByX:andY:)
 #if PLATFORM(IOS)
             || aSelector == @selector(addTouchAtX:y:)
@@ -256,8 +254,6 @@ BOOL replayingSavedEvents;
         return @"setDragMode";
     if (aSelector == @selector(mouseScrollByX:andY:))
         return @"mouseScrollBy";
-    if (aSelector == @selector(mouseScrollByX:andY:withWheel:andMomentumPhases:))
-        return @"mouseScrollByWithWheelAndMomentumPhases";
     if (aSelector == @selector(continuousMouseScrollByX:andY:))
         return @"continuousMouseScrollBy";
     if (aSelector == @selector(scalePageBy:atX:andY:))
@@ -703,56 +699,6 @@ static int buildModifierFlags(const WebScriptObject* modifiers)
     [self mouseScrollByX:x andY:y continuously:NO];
 }
 
-#if !PLATFORM(IOS) && __MAC_OS_X_VERSION_MIN_REQUIRED <= 1090
-const uint32_t kCGScrollWheelEventMomentumPhase = 123;
-#endif
-
-- (void)mouseScrollByX:(int)x andY:(int)y withWheel:(NSString*)phaseName andMomentumPhases:(NSString*)momentumName
-{
-#if !PLATFORM(IOS)
-    uint32_t phase = 0;
-    if ([phaseName isEqualToString: @"none"])
-        phase = 0;
-    else if ([phaseName isEqualToString: @"began"])
-        phase = 1; // kCGScrollPhaseBegan
-    else if ([phaseName isEqualToString: @"changed"])
-        phase = 2; // kCGScrollPhaseChanged;
-    else if ([phaseName isEqualToString: @"ended"])
-        phase = 4; // kCGScrollPhaseEnded;
-    else if ([phaseName isEqualToString: @"cancelled"])
-        phase = 8; // kCGScrollPhaseCancelled;
-    else if ([phaseName isEqualToString: @"maybegin"])
-        phase = 128; // kCGScrollPhaseMayBegin;
-
-    uint32_t momentum = 0;
-    if ([momentumName isEqualToString: @"none"])
-        momentum = 0; // kCGMomentumScrollPhaseNone;
-    else if ([momentumName isEqualToString:@"begin"])
-        momentum = 1; // kCGMomentumScrollPhaseBegin;
-    else if ([momentumName isEqualToString:@"continue"])
-        momentum = 2; // kCGMomentumScrollPhaseContinue;
-    else if ([momentumName isEqualToString:@"end"])
-        momentum = 3; // kCGMomentumScrollPhaseEnd;
-
-    CGEventRef cgScrollEvent = CGEventCreateScrollWheelEvent(NULL, kCGScrollEventUnitLine, 2, y, x);
-
-    // CGEvent locations are in global display coordinates.
-    CGPoint lastGlobalMousePosition = CGPointMake(lastMousePosition.x, [[NSScreen mainScreen] frame].size.height - lastMousePosition.y);
-    CGEventSetLocation(cgScrollEvent, lastGlobalMousePosition);
-    CGEventSetIntegerValueField(cgScrollEvent, kCGScrollWheelEventScrollPhase, phase);
-    CGEventSetIntegerValueField(cgScrollEvent, kCGScrollWheelEventMomentumPhase, momentum);
-    
-    NSEvent* scrollEvent = [NSEvent eventWithCGEvent:cgScrollEvent];
-    CFRelease(cgScrollEvent);
-
-    if (NSView* targetView = [[mainFrame webView] hitTest:[scrollEvent locationInWindow]]) {
-        [NSApp _setCurrentEvent:scrollEvent];
-        [targetView scrollWheel:scrollEvent];
-        [NSApp _setCurrentEvent:nil];
-    }
-#endif
-}
-
 - (NSArray *)contextClick
 {
 #if !PLATFORM(IOS)
index 7ce5d9c..db2c58b 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
@@ -60,7 +60,6 @@ public:
     void mouseUp(unsigned button, WKEventModifiers);
     void mouseMoveTo(double x, double y);
     void mouseScrollBy(int x, int y);
-    void mouseScrollByWithWheelAndMomentumPhases(int x, int y, int phase, int momentum);
     void continuousMouseScrollBy(int x, int y, bool paged);
 
     void leapForward(int milliseconds);
index d67794c..b3aa024 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -28,7 +28,6 @@ interface EventSendingController {
     void mouseUp(long buttonNumber, object modifierArray);
     void mouseMoveTo(long x, long y);
     void mouseScrollBy(long x, long y);
-    void mouseScrollByWithWheelAndMomentumPhases(long x, long y, DOMString phase, DOMString momentum, optional boolean asyncScrolling);
     void continuousMouseScrollBy(long x, long y, optional boolean paged);
     object contextClick();
     void scheduleAsynchronousClick();
index d224d1e..65e3556 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -347,61 +347,6 @@ void EventSendingController::mouseScrollBy(int x, int y)
     WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
 }
 
-void EventSendingController::mouseScrollByWithWheelAndMomentumPhases(int x, int y, JSStringRef phaseStr, JSStringRef momentumStr, bool asyncScrolling)
-{
-    WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
-    WKRetainPtr<WKMutableDictionaryRef> EventSenderMessageBody(AdoptWK, WKMutableDictionaryCreate());
-    
-    WKRetainPtr<WKStringRef> subMessageKey(AdoptWK, WKStringCreateWithUTF8CString("SubMessage"));
-    WKRetainPtr<WKStringRef> subMessageName(AdoptWK, WKStringCreateWithUTF8CString("MouseScrollByWithWheelAndMomentumPhases"));
-    WKDictionarySetItem(EventSenderMessageBody.get(), subMessageKey.get(), subMessageName.get());
-    
-    WKRetainPtr<WKStringRef> xKey(AdoptWK, WKStringCreateWithUTF8CString("X"));
-    WKRetainPtr<WKDoubleRef> xRef(AdoptWK, WKDoubleCreate(x));
-    WKDictionarySetItem(EventSenderMessageBody.get(), xKey.get(), xRef.get());
-    
-    WKRetainPtr<WKStringRef> yKey(AdoptWK, WKStringCreateWithUTF8CString("Y"));
-    WKRetainPtr<WKDoubleRef> yRef(AdoptWK, WKDoubleCreate(y));
-    WKDictionarySetItem(EventSenderMessageBody.get(), yKey.get(), yRef.get());
-
-    uint64_t phase = 0;
-    if (JSStringIsEqualToUTF8CString(phaseStr, "none"))
-        phase = 0;
-    else if (JSStringIsEqualToUTF8CString(phaseStr, "began"))
-        phase = 1; // kCGScrollPhaseBegan
-    else if (JSStringIsEqualToUTF8CString(phaseStr, "changed"))
-        phase = 2; // kCGScrollPhaseChanged
-    else if (JSStringIsEqualToUTF8CString(phaseStr, "ended"))
-        phase = 4; // kCGScrollPhaseEnded
-    else if (JSStringIsEqualToUTF8CString(phaseStr, "cancelled"))
-        phase = 8; // kCGScrollPhaseCancelled
-    else if (JSStringIsEqualToUTF8CString(phaseStr, "maybegin"))
-        phase = 128; // kCGScrollPhaseMayBegin
-
-    WKRetainPtr<WKStringRef> phaseKey(AdoptWK, WKStringCreateWithUTF8CString("Phase"));
-    WKRetainPtr<WKUInt64Ref> phaseRef(AdoptWK, WKUInt64Create(phase));
-    WKDictionarySetItem(EventSenderMessageBody.get(), phaseKey.get(), phaseRef.get());
-
-    uint64_t momentum = 0;
-    if (JSStringIsEqualToUTF8CString(momentumStr, "none"))
-        momentum = 0; // kCGMomentumScrollPhaseNone
-    else if (JSStringIsEqualToUTF8CString(momentumStr, "begin"))
-        momentum = 1; // kCGMomentumScrollPhaseBegin
-    else if (JSStringIsEqualToUTF8CString(momentumStr, "continue"))
-        momentum = 2; // kCGMomentumScrollPhaseContinue
-    else if (JSStringIsEqualToUTF8CString(momentumStr, "end"))
-        momentum = 3; // kCGMomentumScrollPhaseEnd
-
-    WKRetainPtr<WKStringRef> momentumKey(AdoptWK, WKStringCreateWithUTF8CString("Momentum"));
-    WKRetainPtr<WKUInt64Ref> momentumRef(AdoptWK, WKUInt64Create(momentum));
-    WKDictionarySetItem(EventSenderMessageBody.get(), momentumKey.get(), momentumRef.get());
-
-    if (asyncScrolling)
-        WKBundlePostMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get());
-    else
-        WKBundlePostSynchronousMessage(InjectedBundle::shared().bundle(), EventSenderMessageName.get(), EventSenderMessageBody.get(), 0);
-}
-
 void EventSendingController::continuousMouseScrollBy(int x, int y, bool paged)
 {
     WKRetainPtr<WKStringRef> EventSenderMessageName(AdoptWK, WKStringCreateWithUTF8CString("EventSender"));
index fd030b9..c6a9131 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2011, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2010, 2011 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -47,7 +47,6 @@ public:
     void mouseUp(int button, JSValueRef modifierArray);
     void mouseMoveTo(int x, int y);
     void mouseScrollBy(int x, int y);
-    void mouseScrollByWithWheelAndMomentumPhases(int x, int y, JSStringRef phase, JSStringRef momentum, bool asyncScrolling);
     void continuousMouseScrollBy(int x, int y, bool paged);
     JSValueRef contextClick();
     void leapForward(int milliseconds);
index 77c35b4..cdb2f51 100644 (file)
@@ -98,11 +98,6 @@ void EventSenderProxy::mouseScrollBy(int x, int y)
     // Write me.
 }
 
-void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int phase, int momentum)
-{
-    // Write me.
-}
-
 void EventSenderProxy::continuousMouseScrollBy(int x, int y, bool paged)
 {
     // Write me.
index 620e0df..c653d8e 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2010, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2010 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -856,25 +856,6 @@ void TestController::didReceiveMessageFromInjectedBundle(WKStringRef messageName
             return;
         }
 
-        if (WKStringIsEqualToUTF8CString(subMessageName, "MouseScrollByWithWheelAndMomentumPhases")) {
-            WKRetainPtr<WKStringRef> xKey = adoptWK(WKStringCreateWithUTF8CString("X"));
-            double x = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, xKey.get())));
-            
-            WKRetainPtr<WKStringRef> yKey = adoptWK(WKStringCreateWithUTF8CString("Y"));
-            double y = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, yKey.get())));
-            
-            WKRetainPtr<WKStringRef> phaseKey = adoptWK(WKStringCreateWithUTF8CString("Phase"));
-            int phase = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, phaseKey.get()))));
-            WKRetainPtr<WKStringRef> momentumKey = adoptWK(WKStringCreateWithUTF8CString("Momentum"));
-            int momentum = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, momentumKey.get()))));
-            
-            // Forward to WebProcess
-            WKPageSetShouldSendEventsSynchronously(mainWebView()->page(), false);
-            m_eventSenderProxy->mouseScrollByWithWheelAndMomentumPhases(x, y, phase, momentum);
-
-            return;
-        }
-
         ASSERT_NOT_REACHED();
     }
 
@@ -944,25 +925,6 @@ WKRetainPtr<WKTypeRef> TestController::didReceiveSynchronousMessageFromInjectedB
             return 0;
         }
 
-        if (WKStringIsEqualToUTF8CString(subMessageName, "MouseScrollByWithWheelAndMomentumPhases")) {
-            WKRetainPtr<WKStringRef> xKey = adoptWK(WKStringCreateWithUTF8CString("X"));
-            double x = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, xKey.get())));
-            
-            WKRetainPtr<WKStringRef> yKey = adoptWK(WKStringCreateWithUTF8CString("Y"));
-            double y = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, yKey.get())));
-            
-            WKRetainPtr<WKStringRef> phaseKey = adoptWK(WKStringCreateWithUTF8CString("Phase"));
-            int phase = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, phaseKey.get()))));
-            WKRetainPtr<WKStringRef> momentumKey = adoptWK(WKStringCreateWithUTF8CString("Momentum"));
-            int momentum = static_cast<int>(WKUInt64GetValue(static_cast<WKUInt64Ref>(WKDictionaryGetItemForKey(messageBodyDictionary, momentumKey.get()))));
-
-            // Forward to WebProcess
-            WKPageSetShouldSendEventsSynchronously(mainWebView()->page(), true);
-            m_eventSenderProxy->mouseScrollByWithWheelAndMomentumPhases(x, y, phase, momentum);
-            WKPageSetShouldSendEventsSynchronously(mainWebView()->page(), false);
-            return 0;
-        }
-        
         if (WKStringIsEqualToUTF8CString(subMessageName, "ContinuousMouseScrollBy")) {
             WKRetainPtr<WKStringRef> xKey = adoptWK(WKStringCreateWithUTF8CString("X"));
             double x = WKDoubleGetValue(static_cast<WKDoubleRef>(WKDictionaryGetItemForKey(messageBodyDictionary, xKey.get())));
index 7a68c7f..31d3c83 100644 (file)
@@ -392,13 +392,6 @@ void EventSenderProxy::continuousMouseScrollBy(int horizontal, int vertical, boo
     notImplemented();
 }
 
-void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int /*phase*/, int /*momentum*/)
-{
-    // EFL does not have the concept of wheel gesture phases or momentum. Just relay to
-    // the mouse wheel handler.
-    mouseScrollBy(x, y);
-}
-
 void EventSenderProxy::leapForward(int milliseconds)
 {
     if (m_eventQueue.isEmpty())
index 847980e..d253201 100644 (file)
@@ -433,13 +433,6 @@ void EventSenderProxy::continuousMouseScrollBy(int horizontal, int vertical, boo
     sendOrQueueEvent(event);
 }
 
-void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int /*phase*/, int /*momentum*/)
-{
-    // Gtk+ does not have the concept of wheel gesture phases or momentum. Just relay to
-    // the mouse wheel handler.
-    mouseScrollBy(x, y);
-}
-
 void EventSenderProxy::leapForward(int milliseconds)
 {
     if (m_eventQueue.isEmpty())
index 376a581..428b210 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2011, 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
  *
  * Redistribution and use in source and binary forms, with or without
@@ -461,25 +461,4 @@ void EventSenderProxy::continuousMouseScrollBy(int x, int y, bool paged)
     return;
 }
 
-void EventSenderProxy::mouseScrollByWithWheelAndMomentumPhases(int x, int y, int phase, int momentum)
-{
-    RetainPtr<CGEventRef> cgScrollEvent = adoptCF(CGEventCreateScrollWheelEvent(0, kCGScrollEventUnitLine, 2, y, x));
-
-    // CGEvent locations are in global display coordinates.
-    CGPoint lastGlobalMousePosition = CGPointMake(m_position.x, [[NSScreen mainScreen] frame].size.height - m_position.y);
-    CGEventSetLocation(cgScrollEvent.get(), lastGlobalMousePosition);
-
-    CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventScrollPhase, phase);
-    CGEventSetIntegerValueField(cgScrollEvent.get(), kCGScrollWheelEventMomentumPhase, momentum);
-
-    NSEvent* event = [NSEvent eventWithCGEvent: cgScrollEvent.get()];
-
-    // Our event should have the correct settings:
-    if (NSView *targetView = [m_testController->mainWebView()->platformView() hitTest: [event locationInWindow]]) {
-        [NSApp _setCurrentEvent: event];
-        [targetView scrollWheel: event];
-        [NSApp _setCurrentEvent: nil];
-    }
-}
-
 } // namespace WTR