Web Inspector: Duplicate emulated touch events in iframe

https://bugs.webkit.org/show_bug.cgi?id=104653

Reviewed by Vsevolod Vlasov.

Source/WebCore:

Synthetic touch events should be dispatched only on the frame containing its target, not on its ancestor frames,
up to the top frame.

* page/EventHandler.cpp:
(WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):
  Do not dispatch a synthetic touch event on the current frame if its target is in a subframe.

LayoutTests:

The test incorrectly expected two synthetic touchend events from an iframe,
while only one touchstart and one touchend should be dispatched.

* fast/events/touch/emulated-touch-iframe-expected.txt:
* fast/events/touch/emulated-touch-iframe.html:
* fast/events/touch/resources/emulated-touch-iframe2.html:

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6491e9a..01278d5 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2012-12-11  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: Duplicate emulated touch events in iframe
+        https://bugs.webkit.org/show_bug.cgi?id=104653
+
+        Reviewed by Vsevolod Vlasov.
+
+        The test incorrectly expected two synthetic touchend events from an iframe,
+        while only one touchstart and one touchend should be dispatched.
+
+        * fast/events/touch/emulated-touch-iframe-expected.txt:
+        * fast/events/touch/emulated-touch-iframe.html:
+        * fast/events/touch/resources/emulated-touch-iframe2.html:
+
 2012-12-11  Ken Kania  <kkania@chromium.org>
 
         [Inspector] Add command for dispatching mouse events.

diff --git a/LayoutTests/fast/events/touch/emulated-touch-iframe-expected.txt b/LayoutTests/fast/events/touch/emulated-touch-iframe-expected.txt
index d2f4a03..cf8e6bd 100644 (file)
--- a/LayoutTests/fast/events/touch/emulated-touch-iframe-expected.txt
+++ b/LayoutTests/fast/events/touch/emulated-touch-iframe-expected.txt
@@ -1,5 +1,5 @@
 
 Test touchend events are emulated in iframes correctly.
 
-Final touchend (test will time out if broken)
+touchend (test will time out if broken)
 

diff --git a/LayoutTests/fast/events/touch/emulated-touch-iframe.html b/LayoutTests/fast/events/touch/emulated-touch-iframe.html
index 0d81911..8871cd6 100644 (file)
--- a/LayoutTests/fast/events/touch/emulated-touch-iframe.html
+++ b/LayoutTests/fast/events/touch/emulated-touch-iframe.html
@@ -6,15 +6,27 @@
 <div id="console"></div>
 <script type="text/javascript">
 
-var eventCount = 0;
-var EXPECTED_EVENT_COUNT = 2;
+var touchstartCount = 0;
+var EXPECTED_TOUCHSTART_COUNT = 1;
+var shouldBail;
 
 function testComplete()
 {
-    if (++eventCount === EXPECTED_EVENT_COUNT) {
-        debug("Final touchend (test will time out if broken)");
-        window.testRunner.notifyDone();
+    if (shouldBail)
+        return;
+
+    if (touchstartCount > EXPECTED_TOUCHSTART_COUNT) {
+        debug("touchstart fired for the top frame, too, but should only fire for the iframe!");
+        shouldBail = true;
     }
+
+    debug("touchend (test will time out if broken)");
+    window.testRunner.notifyDone();
+}
+
+function handleTouchstart()
+{
+    ++touchstartCount;
 }
 
 function runTest() {

diff --git a/LayoutTests/fast/events/touch/resources/emulated-touch-iframe2.html b/LayoutTests/fast/events/touch/resources/emulated-touch-iframe2.html
index a4027e3..fd8831d 100644 (file)
--- a/LayoutTests/fast/events/touch/resources/emulated-touch-iframe2.html
+++ b/LayoutTests/fast/events/touch/resources/emulated-touch-iframe2.html
@@ -3,6 +3,7 @@
 <div id='mydiv' style='width:100px;height:100px;position:absolute;top:0px; left:0px; background-color:blue;'></div>
 <script type='text/javascript'>
 var myDiv = document.getElementById('mydiv');
+myDiv.addEventListener('touchstart', function() { parent.handleTouchstart(); }, false);
 myDiv.addEventListener('touchend', function() { parent.testComplete(); }, false);
 </script>
 </body>

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c8f1b1c..8c7e434 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2012-12-11  Alexander Pavlov  <apavlov@chromium.org>
+
+        Web Inspector: Duplicate emulated touch events in iframe
+        https://bugs.webkit.org/show_bug.cgi?id=104653
+
+        Reviewed by Vsevolod Vlasov.
+
+        Synthetic touch events should be dispatched only on the frame containing its target, not on its ancestor frames,
+        up to the top frame.
+
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::dispatchSyntheticTouchEventIfEnabled):
+          Do not dispatch a synthetic touch event on the current frame if its target is in a subframe.
+
 2012-12-11  Kondapally Kalyan  <kalyan.kondapally@intel.com>
 
         [EFL][WebGL] Regression(r137211) WebGL is broken with NVIDIA Drivers.

diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index 577564b..8e2eceb 100644 (file)
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -4058,6 +4058,12 @@ bool EventHandler::dispatchSyntheticTouchEventIfEnabled(const PlatformMouseEvent
     if (eventType == PlatformEvent::MouseMoved && !m_touchPressed)
         return false;
 
+    HitTestRequest request(HitTestRequest::Active);
+    MouseEventWithHitTestResults mev = prepareMouseEvent(request, event);
+
+    if (mev.scrollbar() || subframeForHitTestResult(mev))
+        return false;
+
     SyntheticSingleTouchEvent touchEvent(event);
     return handleTouchEvent(touchEvent);
 }