Unreviewed, rolling out r142025.
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Feb 2013 21:57:01 +0000 (21:57 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 6 Feb 2013 21:57:01 +0000 (21:57 +0000)
http://trac.webkit.org/changeset/142025
https://bugs.webkit.org/show_bug.cgi?id=109091

broke the build (Requested by tdanderson on #webkit).

Patch by Sheriff Bot <webkit.review.bot@gmail.com> on 2013-02-06

Source/WebCore:

* dom/GestureEvent.cpp:
(WebCore::GestureEvent::create):
* page/EventHandler.cpp:
(WebCore::EventHandler::handleGestureEvent):
(WebCore::EventHandler::handleGestureScrollUpdate):
* platform/PlatformEvent.h:
* platform/Scrollbar.cpp:
(WebCore::Scrollbar::gestureEvent):
* platform/chromium/PopupContainer.cpp:
(WebCore::PopupContainer::handleGestureEvent):
* rendering/RenderLayer.cpp:
(WebCore::RenderLayer::scrollByRecursively):
* rendering/RenderLayer.h:

Source/WebKit/chromium:

* public/WebInputEvent.h:
(WebKit::WebInputEvent::isGestureEventType):
* src/PageWidgetDelegate.cpp:
(WebKit::PageWidgetDelegate::handleInputEvent):
* src/WebInputEventConversion.cpp:
(WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
* src/WebPluginContainerImpl.cpp:
* src/WebPopupMenuImpl.cpp:
(WebKit::WebPopupMenuImpl::handleInputEvent):
* src/WebViewImpl.cpp:
(WebKit::WebViewImpl::handleGestureEvent):

Tools:

* DumpRenderTree/chromium/TestRunner/src/EventSender.cpp:
(WebTestRunner):
(WebTestRunner::EventSender::EventSender):
(WebTestRunner::EventSender::gestureEvent):
* DumpRenderTree/chromium/TestRunner/src/EventSender.h:
(EventSender):

LayoutTests:

* fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt: Removed.
* fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html: Removed.
* fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt: Removed.
* fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html: Removed.
* fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt: Removed.
* fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html: Removed.
* platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt: Removed.
* platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt: Removed.
* platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt: Removed.
* platform/chromium/plugins/gesture-events-expected.txt:
* platform/chromium/plugins/gesture-events-scrolled-expected.txt:
* platform/chromium/plugins/gesture-events-scrolled.html:
* platform/chromium/plugins/gesture-events.html:

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

32 files changed:
LayoutTests/ChangeLog
LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt [deleted file]
LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html [deleted file]
LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt [deleted file]
LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html [deleted file]
LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt [deleted file]
LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html [deleted file]
LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt [deleted file]
LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt [deleted file]
LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt [deleted file]
LayoutTests/platform/chromium/plugins/gesture-events-expected.txt
LayoutTests/platform/chromium/plugins/gesture-events-scrolled-expected.txt
LayoutTests/platform/chromium/plugins/gesture-events-scrolled.html
LayoutTests/platform/chromium/plugins/gesture-events.html
Source/WebCore/ChangeLog
Source/WebCore/dom/GestureEvent.cpp
Source/WebCore/page/EventHandler.cpp
Source/WebCore/platform/PlatformEvent.h
Source/WebCore/platform/Scrollbar.cpp
Source/WebCore/platform/chromium/PopupContainer.cpp
Source/WebCore/rendering/RenderLayer.cpp
Source/WebCore/rendering/RenderLayer.h
Source/WebKit/chromium/ChangeLog
Source/WebKit/chromium/public/WebInputEvent.h
Source/WebKit/chromium/src/PageWidgetDelegate.cpp
Source/WebKit/chromium/src/WebInputEventConversion.cpp
Source/WebKit/chromium/src/WebPluginContainerImpl.cpp
Source/WebKit/chromium/src/WebPopupMenuImpl.cpp
Source/WebKit/chromium/src/WebViewImpl.cpp
Tools/ChangeLog
Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.cpp
Tools/DumpRenderTree/chromium/TestRunner/src/EventSender.h

index 354091f9f4fecbaa8f8b763dfebc7c2459ba748e..8f0baaca657b0165d814cfa741b0563f3ae57dc4 100644 (file)
@@ -1,3 +1,25 @@
+2013-02-06  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142025.
+        http://trac.webkit.org/changeset/142025
+        https://bugs.webkit.org/show_bug.cgi?id=109091
+
+        broke the build (Requested by tdanderson on #webkit).
+
+        * fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt: Removed.
+        * fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html: Removed.
+        * fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt: Removed.
+        * fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html: Removed.
+        * fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt: Removed.
+        * fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html: Removed.
+        * platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt: Removed.
+        * platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt: Removed.
+        * platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt: Removed.
+        * platform/chromium/plugins/gesture-events-expected.txt:
+        * platform/chromium/plugins/gesture-events-scrolled-expected.txt:
+        * platform/chromium/plugins/gesture-events-scrolled.html:
+        * platform/chromium/plugins/gesture-events.html:
+
 2013-02-06  Zan Dobersek  <zdobersek@igalia.com>
 
         Unreviewed GTK gardening.
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt
deleted file mode 100644 (file)
index 49664c7..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-This tests that a gesture scroll is not propagated from an inner div to an outer div when the inner div has no remaining scroll offset when the GestureScrollUpdateWithoutPropagation event type is used.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-gesture events not implemented on this platform or gesture event scrolling of a document is broken
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated.html
deleted file mode 100644 (file)
index 2801409..0000000
+++ /dev/null
@@ -1,164 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
-<script src="resources/gesture-helpers.js"></script>
-<style type="text/css">
-
-::-webkit-scrollbar {
-    width: 0px;
-    height: 0px;
-}
-
-#greenbox {
-  width: 100px;
-  height: 100px;
-  background: green;
-  padding: 0px;
-  margin: 0px;
-}
-
-#redbox {
-  width: 100px;
-  height: 100px;
-  background: red;
-  padding: 0px;
-  margin: 0px;
-}
-
-#bluebox {
-  width: 100px;
-  height: 100px;
-  background: blue;
-  padding: 0px;
-  margin: 0px;
-}
-
-#innerdiv {
-    width: 200px;
-    height: 200px;
-    overflow-y: scroll;
-    overflow-x: scroll;
-}
-
-#outerdiv {
-    width: 250px;
-    height: 250px;
-    overflow-y: scroll;
-    overflow-x: scroll;
-}
-
-td {
-  padding: 0px;
-}
-
-</style>
-</head>
-<body style="margin:0" onload="runTest();">
-
-<div id="outerdiv">
-  <table border="0" cellspacing="0px" >
-    <tr><td>
-      <div id="innerdiv">
-        <table border="0" cellspacing="0px" >
-          <tr><td><div id="greenbox"></div></td></tr>
-          <tr><td><div id="redbox"></div></td></tr>
-          <tr><td><div id="greenbox"></div></td></tr>
-          <tr><td><div id="redbox"></div></td></tr>
-        </table>
-      </div>
-    </td></tr>
-    <tr><td>
-      <div id="bluebox"></div>
-    </td></tr>
-  </table>
-</div>
-
-<p id="description"></p>
-<div id="console"></div>
-<script type="text/javascript">
-
-var movedbox;
-var touchtarget;
-var expectedGesturesTotal = 2;
-var gesturesOccurred = 0;
-var scrollAmountX = ['0', '0'];
-var scrollAmountY = ['0', '0'];
-var wheelEventsOccurred = 0;
-var expectedWheelEventsOccurred = ['0', '0'];
-var scrollEventsOccurred = 0;
-var scrolledElement = 'movedbox'
-var scrollEventsOccurred = 0;
-var expectedScrollEventsOccurred = '1';
-
-
-function recordScroll(event) {
-       debug('scroll event ' + scrollEventsOccurred + '+> ' + event.target);
-       scrollEventsOccurred++;
-
-       if (window.eventSender) {
-               // Because scroll events arrive asynchronously, only one will arrive.
-           if (gesturesOccurred == expectedGesturesTotal) {
-                       shouldBe('scrollEventsOccurred', expectedScrollEventsOccurred);
-               // If we've got here, we've passed.
-               successfullyParsed = true;
-               isSuccessfullyParsed();
-               if (window.testRunner)
-                   testRunner.notifyDone();
-               }
-    }
-}
-
-
-function firstGestureScroll()
-{
-    debug("first gesture");
-    eventSender.gestureScrollBegin(10, 72);
-    eventSender.gestureScrollUpdateWithoutPropagation(0, -150);
-    eventSender.gestureScrollEnd(0, 0);
-
-    // Wait for layout.
-    checkScrollOffset();
-}
-
-function secondGestureScroll()
-{
-    debug("second gesture");
-    eventSender.gestureScrollBegin(12, 40);
-    eventSender.gestureScrollUpdateWithoutPropagation(0, -60);
-    eventSender.gestureScrollEnd(0, 0);
-
-    // Wait for layout.
-    checkScrollOffset();
-}
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-
-function runTest()
-{
-    movedbox = document.getElementById("outerdiv");
-    touchtarget = document.getElementById("innerdiv");
-    touchtarget.addEventListener("scroll", recordScroll);
-    touchtarget.addEventListener("mousewheel", recordWheel);
-
-    if (window.eventSender) {
-        description('This tests that a gesture scroll is not propagated from an ' +
-                'inner div to an outer div when the inner div has no ' +
-                'remaining scroll offset when the GestureScrollUpdateWithoutPropagation ' +
-                'event type is used.');
-        if (checkTestDependencies() && window.eventSender.gestureScrollUpdateWithoutPropagation)
-            firstGestureScroll();
-        else
-            exitIfNecessary();
-    } else {
-        debug("This test requires DumpRenderTree.  Gesture-scroll the page to validate the implementation.");
-    }
-}
-</script>
-
-
-
-</body>
-</html>
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt
deleted file mode 100644 (file)
index 0a80763..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-This tests that a gesture scroll is not propagated from an iframe to an outer div when the iframe has no remaining scroll offset when the gesture type GestureScrollUpdateWithoutPropagation is used.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-gesture events not implemented on this platform or gesture event scrolling of a document is broken
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated.html
deleted file mode 100644 (file)
index a6d9f22..0000000
+++ /dev/null
@@ -1,142 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
-<script src="resources/gesture-helpers.js"></script>
-<style type="text/css">
-
-::-webkit-scrollbar {
-    width: 0px;
-    height: 0px;
-}
-
-#bluebox {
-  width: 100px;
-  height: 100px;
-  background: blue;
-  padding: 0px;
-  margin: 0px;
-}
-
-#container {
-    width: 150px;
-    height: 150px;
-    overflow-y: scroll;
-    overflow-x: scroll;
-}
-
-#outerdiv {
-    width: 200px;
-    height: 200px;
-    overflow-y: scroll;
-    overflow-x: scroll;
-}
-
-td {
-  padding: 0px;
-}
-
-</style>
-</head>
-<body style="margin:0" >
-
-<div id="outerdiv">
-  <table border="0" cellspacing="0px" >
-    <tr><td>
-      <div id="container">
-        <iframe id="touchtargetiframe" src="resources/scroll-inside-editable-iframe.html"></iframe>
-      </div>
-    </td></tr>
-    <tr><td>
-      <div id="bluebox"></div>
-    </td></tr>
-  </table>
-</div>
-
-<p id="description"></p>
-<div id="console"></div>
-<script type="text/javascript">
-
-var movedbox;
-var touchtarget;
-var expectedGesturesTotal = 2;
-var gesturesOccurred = 0;
-var scrollAmountX = ['0', '0'];
-var scrollAmountY = ['0', '0'];
-var wheelEventsOccurred = 0;
-var expectedWheelEventsOccurred = ['0', '0'];
-var scrollEventsOccurred = 0;
-var scrolledElement = 'movedbox'
-var scrollEventsOccurred = 0;
-var expectedScrollEventsOccurred = '1';
-
-
-function recordScroll(event) {
-       debug('scroll event ' + scrollEventsOccurred + '+> ' + event.target);
-       scrollEventsOccurred++;
-
-       if (window.eventSender) {
-               // Because scroll events arrive asynchronously, only one will arrive.
-           if (gesturesOccurred == expectedGesturesTotal) {
-                       shouldBe('scrollEventsOccurred', expectedScrollEventsOccurred);
-               // If we've got here, we've passed.
-               successfullyParsed = true;
-               isSuccessfullyParsed();
-               if (window.testRunner)
-                   testRunner.notifyDone();
-               }
-    }
-}
-
-
-function firstGestureScroll()
-{
-    debug("first gesture");
-    eventSender.gestureScrollBegin(10, 72);
-    eventSender.gestureScrollUpdateWithoutPropagation(0, -700);
-    eventSender.gestureScrollEnd(0, 0);
-
-    // Wait for layout.
-    checkScrollOffset();
-}
-
-function secondGestureScroll()
-{
-    debug("second gesture");
-    eventSender.gestureScrollBegin(12, 40);
-    eventSender.gestureScrollUpdateWithoutPropagation(0, -100);
-    eventSender.gestureScrollEnd(0, 0);
-
-    // Wait for layout.
-    checkScrollOffset();
-}
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-
-function runTest()
-{
-    movedbox = document.getElementById("outerdiv");
-    touchtarget = document.getElementById("touchtargetiframe");
-    touchtarget.contentDocument.addEventListener("scroll", recordScroll);
-    touchtarget.contentDocument.body.addEventListener("mousewheel", recordWheel);
-
-    if (window.eventSender) {
-        description('This tests that a gesture scroll is not propagated from an ' +
-                'iframe to an outer div when the iframe has no remaining ' +
-                'scroll offset when the gesture type GestureScrollUpdateWithoutPropagation is used.');
-        if (checkTestDependencies() && window.eventSender.gestureScrollUpdateWithoutPropagation)
-            firstGestureScroll();
-        else
-            exitIfNecessary();
-    } else {
-        debug("This test requires DumpRenderTree.  Gesture-scroll the page to validate the implementation.");
-    }
-}
-</script>
-
-
-
-</body>
-</html>
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt
deleted file mode 100644 (file)
index 6fbcb0b..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-
-This tests that a gesture scroll is not propagated from a div to the page when the div has no remaining scroll offset when the GestureScrollUpdateWithoutPropagation event type is used.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-gesture events not implemented on this platform or gesture event scrolling of a document is broken
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html b/LayoutTests/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated.html
deleted file mode 100644 (file)
index b385245..0000000
+++ /dev/null
@@ -1,173 +0,0 @@
-<!DOCTYPE html>
-<html>
-<head>
-<link rel="stylesheet" href="../../../js/resources/js-test-style.css">
-<script src="../../../js/resources/js-test-pre.js"></script>
-<script src="resources/gesture-helpers.js"></script>
-<style type="text/css">
-::-webkit-scrollbar {
-    width: 0px;
-    height: 0px;
-}
-
-#greenbox {
-  width: 100px;
-  height: 100px;
-  background: green;
-  padding: 0px;
-  margin: 0px;
-}
-
-#redbox {
-  width: 100px;
-  height: 100px;
-  background: red;
-  padding: 0px;
-  margin: 0px;
-}
-
-#bluebox {
-  width: 100px;
-  height: 100px;
-  background: blue;
-  padding: 0px;
-  margin: 0px;
-}
-
-#yellowbox {
-  width: 100px;
-  height: 100px;
-  background: yellow;
-  padding: 0px;
-  margin: 0px;
-}
-
-#touchtargetdiv {
-    width: 200px;
-    height: 200px;
-    overflow-y: scroll;
-    overflow-x: scroll;
-}
-
-td {
-  padding: 0px;
-}
-</style>
-</head>
-<body style="margin:0" onload="runTest();">
-
-<div id="touchtargetdiv">
-  <table border="0" cellspacing="0px" >
-    <tr><td><div id="yellowbox"></div></td></tr>
-    <tr><td><div id="bluebox"></div></td></tr>
-    <tr><td><div id="yellowbox"></div></td></tr>
-    <tr><td><div id="bluebox"></div></td></tr>
-  </table>
-</div>
-
-<table id="table_to_fill" border="0" cellspacing="0px">
-  <tr><td><div id="greenbox"></div></td></tr>
-  <tr><td><div id="redbox"></div></td></tr>
-</table>
-
-<p id="description"></p>
-<div id="console"></div>
-<script type="text/javascript">
-
-var touchtarget;
-var expectedGesturesTotal = 2;
-var gesturesOccurred = 0;
-var scrollAmountX = ['0', '0'];
-var scrollAmountY = ['0', '0'];
-var wheelEventsOccurred = 0;
-var expectedWheelEventsOccurred = ['0', '0'];
-var scrollEventsOccurred = 0;
-var scrolledElement = 'document.body'
-var scrollEventsOccurred = 0;
-var expectedScrollEventsOccurred = '1';
-
-function recordScroll(event) {
-       debug('scroll event ' + scrollEventsOccurred + '+> ' + event.target);
-       scrollEventsOccurred++;
-
-       if (window.eventSender) {
-               // Because scroll events arrive asynchronously, only one will arrive.
-           if (gesturesOccurred == expectedGesturesTotal) {
-                       shouldBe('scrollEventsOccurred', expectedScrollEventsOccurred);
-               // If we've got here, we've passed.
-               successfullyParsed = true;
-               isSuccessfullyParsed();
-               if (window.testRunner)
-                   testRunner.notifyDone();
-               }
-    }
-}
-
-// Always construct a page larger than the vertical height of the window.
-function buildPage()
-{
-    var table = document.getElementById('table_to_fill');
-    var targetHeight = document.body.offsetHeight;
-    var cellPairHeight = table.offsetHeight;
-    var numberOfReps = targetHeight / cellPairHeight * 2;
-    var i;
-    for (i = 0; i < numberOfReps; i++) {
-        var p = document.createElement('tr');
-        p.innerHTML = '<td><div id="greenbox"></div></td>';
-        table.appendChild(p);
-        var p = document.createElement('tr');
-        p.innerHTML = '<td><div id="redbox"></div></td>';
-        table.appendChild(p);
-    }
-}
-
-function firstGestureScroll()
-{
-    debug("first gesture");
-    eventSender.gestureScrollBegin(10, 72);
-    eventSender.gestureScrollUpdateWithoutPropagation(0, -110);
-    eventSender.gestureScrollEnd(0, 0);
-
-    // Wait for layout.
-    checkScrollOffset();
-}
-
-function secondGestureScroll()
-{
-    debug("second gesture");
-    eventSender.gestureScrollBegin(12, 40);
-    eventSender.gestureScrollUpdateWithoutPropagation(0, -250);
-    eventSender.gestureScrollEnd(0, 0);
-
-    // Wait for layout.
-    checkScrollOffset();
-}
-
-if (window.testRunner)
-    testRunner.waitUntilDone();
-
-function runTest()
-{
-    buildPage();
-    touchtarget = document.getElementById('touchtargetdiv');
-    touchtarget.addEventListener("scroll", recordScroll);
-    touchtarget.addEventListener("mousewheel", recordWheel);
-
-    if (window.eventSender) {
-        description('This tests that a gesture scroll is not propagated from a div ' + 
-                'to the page when the div has no remaining scroll offset when ' +
-                'the GestureScrollUpdateWithoutPropagation event type is used.');
-        if (checkTestDependencies() && window.eventSender.gestureScrollUpdateWithoutPropagation)
-            firstGestureScroll();
-        else
-            exitIfNecessary();
-    } else {
-        debug("This test requires DumpRenderTree.  Gesture-scroll the page to validate the implementation.");
-    }
-}
-</script>
-
-
-
-</body>
-</html>
diff --git a/LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt b/LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-div-not-propagated-expected.txt
deleted file mode 100644 (file)
index 9c1aeee..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-This tests that a gesture scroll is not propagated from an inner div to an outer div when the inner div has no remaining scroll offset when the GestureScrollUpdateWithoutPropagation event type is used.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-first gesture
-PASS movedbox.scrollTop is 0
-PASS movedbox.scrollLeft is 0
-PASS wheelEventsOccurred is 0
-second gesture
-PASS movedbox.scrollTop is 0
-PASS movedbox.scrollLeft is 0
-PASS wheelEventsOccurred is 0
-scroll event 0+> [object HTMLDivElement]
-PASS scrollEventsOccurred is 1
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt b/LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-iframe-not-propagated-expected.txt
deleted file mode 100644 (file)
index 380fe13..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
-
-This tests that a gesture scroll is not propagated from an iframe to an outer div when the iframe has no remaining scroll offset when the gesture type GestureScrollUpdateWithoutPropagation is used.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-first gesture
-PASS movedbox.scrollTop is 0
-PASS movedbox.scrollLeft is 0
-PASS wheelEventsOccurred is 0
-second gesture
-PASS movedbox.scrollTop is 0
-PASS movedbox.scrollLeft is 0
-PASS wheelEventsOccurred is 0
-scroll event 0+> [object HTMLDocument]
-PASS scrollEventsOccurred is 1
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
diff --git a/LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt b/LayoutTests/platform/chromium/fast/events/touch/gesture/touch-gesture-scroll-page-not-propagated-expected.txt
deleted file mode 100644 (file)
index 5426dc2..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-This tests that a gesture scroll is not propagated from a div to the page when the div has no remaining scroll offset when the GestureScrollUpdateWithoutPropagation event type is used.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-first gesture
-PASS document.body.scrollTop is 0
-PASS document.body.scrollLeft is 0
-PASS wheelEventsOccurred is 0
-second gesture
-PASS document.body.scrollTop is 0
-PASS document.body.scrollLeft is 0
-PASS wheelEventsOccurred is 0
-scroll event 0+> [object HTMLDivElement]
-PASS scrollEventsOccurred is 1
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
index c4ba2b3a2e55973441e2a8cfebfdf3bedeefdb40..162dff48cdbacf8440c86cae6139075788f3942a 100644 (file)
@@ -6,6 +6,5 @@ Plugin received event: MouseUp
 Plugin received event: GestureTapDown
 Plugin received event: GestureScrollBegin
 Plugin received event: GestureScrollUpdate
-Plugin received event: GestureScrollUpdate
 Plugin received event: GestureScrollEnd
 
index 1473a44765c602ad921c80f66585e0484bc86963..84a0ed867c22b4fabcf32ece359b9f06f1100a54 100644 (file)
@@ -5,6 +5,5 @@ Plugin received event: MouseDown
 Plugin received event: MouseUp
 Plugin received event: GestureScrollBegin
 Plugin received event: GestureScrollUpdate
-Plugin received event: GestureScrollUpdate
 Plugin received event: GestureScrollEnd
 
index aa7a83bf45a34b3de56e1ca63561e144551e2da5..c8d1971fc3f0bad893276069df12f93c813df681 100644 (file)
@@ -35,7 +35,6 @@
         eventSender.gestureTap(positionX, positionY);
         eventSender.gestureScrollBegin(positionX, positionY);
         eventSender.gestureScrollUpdate(30, 0);
-        eventSender.gestureScrollUpdateWithoutPropagation(30, 0);
         eventSender.gestureScrollEnd(0, 0);
     }
 
index 0be1f4082a0ff73ad0683d7aedf3fc604cac59e0..e47bce550a54cd0d05ca9da3cdd07cd303d407c4 100644 (file)
@@ -24,7 +24,6 @@
         eventSender.gestureTapDown(positionX, positionY);
         eventSender.gestureScrollBegin(positionX, positionY);
         eventSender.gestureScrollUpdate(30, 0);
-        eventSender.gestureScrollUpdateWithoutPropagation(30, 0);
         eventSender.gestureScrollEnd(0, 0);
     }
 
index e75309ef92ac36d8c383eb4ba93cef38745d46b8..6250439f9259b82d81751969ff772f39e040abda 100644 (file)
@@ -1,3 +1,25 @@
+2013-02-06  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142025.
+        http://trac.webkit.org/changeset/142025
+        https://bugs.webkit.org/show_bug.cgi?id=109091
+
+        broke the build (Requested by tdanderson on #webkit).
+
+        * dom/GestureEvent.cpp:
+        (WebCore::GestureEvent::create):
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::handleGestureEvent):
+        (WebCore::EventHandler::handleGestureScrollUpdate):
+        * platform/PlatformEvent.h:
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::gestureEvent):
+        * platform/chromium/PopupContainer.cpp:
+        (WebCore::PopupContainer::handleGestureEvent):
+        * rendering/RenderLayer.cpp:
+        (WebCore::RenderLayer::scrollByRecursively):
+        * rendering/RenderLayer.h:
+
 2013-02-06  Mark Lam  <mark.lam@apple.com>
 
         Split openDatabase() between front and back end work.
index 3536607456a426d9f0f82744494a7ef2cdd8f6cf..1e7b87e7af2a5fce74bfee568f7d3c4e8735ac75 100644 (file)
@@ -47,7 +47,6 @@ PassRefPtr<GestureEvent> GestureEvent::create(PassRefPtr<AbstractView> view, con
     case PlatformEvent::GestureScrollEnd:
         eventType = eventNames().gesturescrollendEvent; break;
     case PlatformEvent::GestureScrollUpdate:
-    case PlatformEvent::GestureScrollUpdateWithoutPropagation:
         eventType = eventNames().gesturescrollupdateEvent; break;
     case PlatformEvent::GestureTap:
         eventType = eventNames().gesturetapEvent; break;
index df6f74f4f931dac7b8719785a905cef719454803..686e25cefaf1f69d5f8acc18fef64279a97d5846 100644 (file)
@@ -2433,9 +2433,7 @@ bool EventHandler::handleGestureEvent(const PlatformGestureEvent& gestureEvent)
 
     Node* eventTarget = 0;
     Scrollbar* scrollbar = 0;
-    if (gestureEvent.type() == PlatformEvent::GestureScrollEnd
-        || gestureEvent.type() == PlatformEvent::GestureScrollUpdate
-        || gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation) {
+    if (gestureEvent.type() == PlatformEvent::GestureScrollEnd || gestureEvent.type() == PlatformEvent::GestureScrollUpdate) {
         scrollbar = m_scrollbarHandlingScrollGesture.get();
         eventTarget = m_scrollGestureHandlingNode.get();
     }
@@ -2497,7 +2495,6 @@ bool EventHandler::handleGestureEvent(const PlatformGestureEvent& gestureEvent)
     case PlatformEvent::GestureScrollBegin:
         return handleGestureScrollBegin(gestureEvent);
     case PlatformEvent::GestureScrollUpdate:
-    case PlatformEvent::GestureScrollUpdateWithoutPropagation:
         return handleGestureScrollUpdate(gestureEvent);
     case PlatformEvent::GestureTap:
         return handleGestureTap(gestureEvent);
@@ -2706,14 +2703,10 @@ bool EventHandler::handleGestureScrollUpdate(const PlatformGestureEvent& gesture
     if (!latchedRenderer)
         return false;
 
-    RenderLayer::ScrollPropagation shouldPropagate = RenderLayer::ShouldPropagateScroll;
-    if (gestureEvent.type() == PlatformEvent::GestureScrollUpdateWithoutPropagation)
-        shouldPropagate = RenderLayer::DontPropagateScroll;
-
     const float scaleFactor = m_frame->pageZoomFactor() * m_frame->frameScaleFactor();
     delta.scale(1 / scaleFactor, 1 / scaleFactor);
 
-    bool result = latchedRenderer->enclosingLayer()->scrollBy(delta, RenderLayer::ScrollOffsetClamped, shouldPropagate);
+    bool result = latchedRenderer->enclosingLayer()->scrollByRecursively(delta, RenderLayer::ScrollOffsetClamped);
 
     if (result)
         setFrameWasScrolledByUser();
index 2547a2ea0aa1534cb127c5249d22124313d30059..61e508da5ee1713dcea5c973b883b3a224a1c9ea 100644 (file)
@@ -52,7 +52,6 @@ public:
         GestureScrollBegin,
         GestureScrollEnd,
         GestureScrollUpdate,
-        GestureScrollUpdateWithoutPropagation,
         GestureTap,
         GestureTapDown,
         GestureTapDownCancel,
index 45a48ddbc4de725d68b5bba359d6cdfccd62a6a3..2a8fa85a4b1e2127e19fa52955686fda712fe206 100644 (file)
@@ -373,7 +373,6 @@ bool Scrollbar::gestureEvent(const PlatformGestureEvent& evt)
         }
         break;
     case PlatformEvent::GestureScrollUpdate:
-    case PlatformEvent::GestureScrollUpdateWithoutPropagation:
         if (m_pressedPart == ThumbPart) {
             m_scrollPos += HorizontalScrollbar ? evt.deltaX() : evt.deltaY();
             moveThumb(m_scrollPos, false);
index 4925e0442ed2d430fb6de2371310814d97d2d88b..3deb95a928bec91c8ab6826adff533d8b7add9e9 100644 (file)
@@ -321,8 +321,7 @@ bool PopupContainer::handleGestureEvent(const PlatformGestureEvent& gestureEvent
     }
     case PlatformEvent::GestureDoubleTap:
         break;
-    case PlatformEvent::GestureScrollUpdate:
-    case PlatformEvent::GestureScrollUpdateWithoutPropagation: {
+    case PlatformEvent::GestureScrollUpdate: {
         PlatformWheelEvent syntheticWheelEvent(gestureEvent.position(), gestureEvent.globalPosition(), gestureEvent.deltaX(), gestureEvent.deltaY(), gestureEvent.deltaX() / 120.0f, gestureEvent.deltaY() / 120.0f, ScrollByPixelWheelEvent, gestureEvent.shiftKey(), gestureEvent.ctrlKey(), gestureEvent.altKey(), gestureEvent.metaKey());
         handleWheelEvent(syntheticWheelEvent);
         return true;
index 419a9e0c7376a399e51a296f82740683d95ef83e..68a065b031811046cc0d707b62c381b1e890e5e1 100644 (file)
@@ -1988,12 +1988,7 @@ void RenderLayer::panScrollFromPoint(const IntPoint& sourcePoint)
     scrollByRecursively(adjustedScrollDelta(delta), ScrollOffsetClamped);
 }
 
-void RenderLayer::scrollByRecursively(const IntSize& delta, ScrollOffsetClamping clamp)
-{
-    scrollBy(delta, clamp, ShouldPropagateScroll);
-}
-
-bool RenderLayer::scrollBy(const IntSize& delta, ScrollOffsetClamping clamp, ScrollPropagation shouldPropagate)
+bool RenderLayer::scrollByRecursively(const IntSize& delta, ScrollOffsetClamping clamp)
 {
     if (delta.isZero())
         return false;
@@ -2006,15 +2001,12 @@ bool RenderLayer::scrollBy(const IntSize& delta, ScrollOffsetClamping clamp, Scr
         IntSize newScrollOffset = scrollOffset() + delta;
         scrollToOffset(newScrollOffset, clamp);
 
-        if (shouldPropagate == DontPropagateScroll)
-            return true;
-
         // If this layer can't do the scroll we ask the next layer up that can scroll to try
         IntSize remainingScrollOffset = newScrollOffset - scrollOffset();
         bool didScroll = true;
         if (!remainingScrollOffset.isZero() && renderer()->parent()) {
             if (RenderLayer* scrollableLayer = enclosingScrollableLayer())
-                didScroll = scrollableLayer->scrollBy(remainingScrollOffset, clamp, shouldPropagate);
+                didScroll = scrollableLayer->scrollByRecursively(remainingScrollOffset, clamp);
 
             Frame* frame = renderer()->frame();
             if (frame)
index 0b674533e6d52d265bc05b9a37ca3722b36f28df..2aaf0aeea3dac65dbc2286880691f578f8f23ed7 100644 (file)
@@ -328,14 +328,8 @@ public:
         ScrollOffsetClamped
     };
 
-    enum ScrollPropagation {
-        ShouldPropagateScroll,
-        DontPropagateScroll
-    };
-
     // Scrolling methods for layers that can scroll their overflow.
-    bool scrollBy(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped, ScrollPropagation = DontPropagateScroll);
-    void scrollByRecursively(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped);
+    bool scrollByRecursively(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped);
     void scrollToOffset(const IntSize&, ScrollOffsetClamping = ScrollOffsetUnclamped);
     void scrollToXOffset(int x, ScrollOffsetClamping clamp = ScrollOffsetUnclamped) { scrollToOffset(IntSize(x, scrollYOffset()), clamp); }
     void scrollToYOffset(int y, ScrollOffsetClamping clamp = ScrollOffsetUnclamped) { scrollToOffset(IntSize(scrollXOffset(), y), clamp); }
index 1b1de65aa242f88ff90953cdd3c04073dd2d3806..dbf0305a4cfca17fe07180e1f95fadb3dbce49a8 100644 (file)
@@ -1,3 +1,23 @@
+2013-02-06  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142025.
+        http://trac.webkit.org/changeset/142025
+        https://bugs.webkit.org/show_bug.cgi?id=109091
+
+        broke the build (Requested by tdanderson on #webkit).
+
+        * public/WebInputEvent.h:
+        (WebKit::WebInputEvent::isGestureEventType):
+        * src/PageWidgetDelegate.cpp:
+        (WebKit::PageWidgetDelegate::handleInputEvent):
+        * src/WebInputEventConversion.cpp:
+        (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
+        * src/WebPluginContainerImpl.cpp:
+        * src/WebPopupMenuImpl.cpp:
+        (WebKit::WebPopupMenuImpl::handleInputEvent):
+        * src/WebViewImpl.cpp:
+        (WebKit::WebViewImpl::handleGestureEvent):
+
 2013-02-06  Daniel Cheng  <dcheng@google.com>
 
         [chromium] Remove "config.h" header from WebUnitTests.cpp
index 99d34ab768c5df22c6fa716f0350ab22b4d1c04f..0b0ff2df086509e5f78ff6733c6f264487bb2941 100644 (file)
@@ -115,7 +115,6 @@ public:
         GestureScrollBegin,
         GestureScrollEnd,
         GestureScrollUpdate,
-        GestureScrollUpdateWithoutPropagation,
         GestureFlingStart,
         GestureFlingCancel,
         GestureTap,
@@ -223,7 +222,6 @@ public:
         return type == GestureScrollBegin
             || type == GestureScrollEnd
             || type == GestureScrollUpdate
-            || type == GestureScrollUpdateWithoutPropagation
             || type == GestureFlingStart
             || type == GestureFlingCancel
             || type == GesturePinchBegin
index 659821478654db3f0da7feb502f136e3be2b9b4e..96f09a61007992d5ad3cc590110994a40edb5c30 100644 (file)
@@ -152,7 +152,6 @@ bool PageWidgetDelegate::handleInputEvent(Page* page, PageWidgetEventHandler& ha
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureScrollUpdate:
-    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
     case WebInputEvent::GestureFlingStart:
     case WebInputEvent::GestureFlingCancel:
     case WebInputEvent::GestureTap:
index e42e16e1a167d17171d64837473f75cb77e1ee48..9ed080fd81e3205e7509be8d2574500bb408a90e 100644 (file)
@@ -153,11 +153,6 @@ PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const W
         m_deltaX = e.data.scrollUpdate.deltaX;
         m_deltaY = e.data.scrollUpdate.deltaY;
         break;
-    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
-        m_type = PlatformEvent::GestureScrollUpdateWithoutPropagation;
-        m_deltaX = e.data.scrollUpdate.deltaX;
-        m_deltaY = e.data.scrollUpdate.deltaY;
-        break;
     case WebInputEvent::GestureTap:
         m_type = PlatformEvent::GestureTap;
         m_area = IntSize(e.data.tap.width, e.data.tap.height);
index bad3f811c0079bb9950874043112181e35c739d3..b89bcd1d73273c6b965790ba46bc32c5ccd31239 100644 (file)
@@ -796,7 +796,7 @@ void WebPluginContainerImpl::handleGestureEvent(GestureEvent* event)
         return;
     }
 
-    if (webEvent.type == WebInputEvent::GestureScrollUpdate || webEvent.type == WebInputEvent::GestureScrollUpdateWithoutPropagation) {
+    if (webEvent.type == WebInputEvent::GestureScrollUpdate) {
         if (!m_scrollbarGroup)
             return;
         if (gestureScrollHelper(m_scrollbarGroup.get(), ScrollLeft, ScrollRight, webEvent.data.scrollUpdate.deltaX))
index 8344863facced3899d7996d35b0fdbf06b32564f..108204f0225855fe124a9749579ff360a7c70c7e 100644 (file)
@@ -273,7 +273,6 @@ bool WebPopupMenuImpl::handleInputEvent(const WebInputEvent& inputEvent)
     case WebInputEvent::GestureScrollBegin:
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureScrollUpdate:
-    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
     case WebInputEvent::GestureFlingStart:
     case WebInputEvent::GestureFlingCancel:
     case WebInputEvent::GestureTap:
index ac8b88e1ce6be5ea4f725e155582d4c8f318460d..2d885160a6d82115776216399700789cf4e8e224 100644 (file)
@@ -811,7 +811,6 @@ bool WebViewImpl::handleGestureEvent(const WebGestureEvent& event)
         m_client->cancelScheduledContentIntents();
     case WebInputEvent::GestureScrollEnd:
     case WebInputEvent::GestureScrollUpdate:
-    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
     case WebInputEvent::GestureTapCancel:
     case WebInputEvent::GesturePinchEnd:
     case WebInputEvent::GesturePinchUpdate: {
index e3f77ecdd35321eb651935f35ae37479e5244dbb..89848fdf36c876889f8e1a9e1ae1067c39701905 100644 (file)
@@ -1,3 +1,18 @@
+2013-02-06  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r142025.
+        http://trac.webkit.org/changeset/142025
+        https://bugs.webkit.org/show_bug.cgi?id=109091
+
+        broke the build (Requested by tdanderson on #webkit).
+
+        * DumpRenderTree/chromium/TestRunner/src/EventSender.cpp:
+        (WebTestRunner):
+        (WebTestRunner::EventSender::EventSender):
+        (WebTestRunner::EventSender::gestureEvent):
+        * DumpRenderTree/chromium/TestRunner/src/EventSender.h:
+        (EventSender):
+
 2013-02-06  Terry Anderson  <tdanderson@chromium.org>
 
         Add support for gesture scroll events that do not propagate to enclosing scrollables
index 2d4e2c563c86db5cc33337f7258a431bfe09cae0..ab60193d77082d39c556f3e39c33a00437965f5b 100644 (file)
@@ -293,7 +293,6 @@ EventSender::EventSender()
     bindMethod("gestureScrollEnd", &EventSender::gestureScrollEnd);
     bindMethod("gestureScrollFirstPoint", &EventSender::gestureScrollFirstPoint);
     bindMethod("gestureScrollUpdate", &EventSender::gestureScrollUpdate);
-    bindMethod("gestureScrollUpdateWithoutPropagation", &EventSender::gestureScrollUpdateWithoutPropagation);
     bindMethod("gestureTap", &EventSender::gestureTap);
     bindMethod("gestureTapDown", &EventSender::gestureTapDown);
     bindMethod("gestureTapCancel", &EventSender::gestureTapCancel);
@@ -1138,12 +1137,6 @@ void EventSender::gestureScrollUpdate(const CppArgumentList& arguments, CppVaria
     gestureEvent(WebInputEvent::GestureScrollUpdate, arguments);
 }
 
-void EventSender::gestureScrollUpdateWithoutPropagation(const CppArgumentList& arguments, CppVariant* result)
-{
-    result->setNull();
-    gestureEvent(WebInputEvent::GestureScrollUpdateWithoutPropagation, arguments);
-}
-
 void EventSender::gestureTap(const CppArgumentList& arguments, CppVariant* result)
 {
     result->setNull();
@@ -1202,7 +1195,6 @@ void EventSender::gestureEvent(WebInputEvent::Type type, const CppArgumentList&
 
     switch (type) {
     case WebInputEvent::GestureScrollUpdate:
-    case WebInputEvent::GestureScrollUpdateWithoutPropagation:
         event.data.scrollUpdate.deltaX = static_cast<float>(arguments[0].toDouble());
         event.data.scrollUpdate.deltaY = static_cast<float>(arguments[1].toDouble());
         event.x = m_currentGestureLocation.x;
index 6705f3daf5536cfc506807afe6554a69bbf6416d..07f928d0553ed58a01edbbaca62adb4c4ec28e3c 100644 (file)
@@ -108,7 +108,6 @@ public:
     void gestureScrollEnd(const CppArgumentList&, CppVariant*);
     void gestureScrollFirstPoint(const CppArgumentList&, CppVariant*);
     void gestureScrollUpdate(const CppArgumentList&, CppVariant*);
-    void gestureScrollUpdateWithoutPropagation(const CppArgumentList&, CppVariant*);
     void gestureTap(const CppArgumentList&, CppVariant*);
     void gestureTapDown(const CppArgumentList&, CppVariant*);
     void gestureTapCancel(const CppArgumentList&, CppVariant*);