[chromium] Compute the best target node on a GestureTap event

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

Patch by Terry Anderson <tdanderson@chromium.org> on 2012-05-14
Reviewed by Adam Barth.

Source/WebCore:

Using tests in the touchadjustment/ directory.

* WebCore.gypi:
Include TouchAdjustment.* files.
* page/TouchAdjustment.cpp:
Included math.h because of an 'Undeclared identifier: INFINITY' when
this patch was landed before.

Source/WebKit/chromium:

* features.gypi:
Enable the touch adjustment code by default.
* src/WebInputEventConversion.cpp:
(WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
In the case of a GestureTap, deltaX represents the horizontal padding of the touch
area and deltaY represents the vertical padding of the touch area.

LayoutTests:

* platform/chromium/test_expectations.txt:
The flaky tests in touchadjustment/ have been addressed in WK86218.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 6987ea7..df7bd98 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2012-05-14  Terry Anderson  <tdanderson@chromium.org>
+
+        [chromium] Compute the best target node on a GestureTap event
+        https://bugs.webkit.org/show_bug.cgi?id=85101
+
+        Reviewed by Adam Barth.
+
+        * platform/chromium/test_expectations.txt:
+        The flaky tests in touchadjustment/ have been addressed in WK86218.
+
 2012-05-14  Jian Li  <jianli@chromium.org>
 
         Unreviewed. Mark one test as failed on chromium.

diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 13526de..d7473db 100644 (file)
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -143,9 +143,6 @@ BUGWK72010 SKIP : fast/dom/navigator-vibration.html = FAIL
 // Battery Status API is not supported yet in the chromium port.
 BUGWK62698 SKIP : batterystatus = PASS FAIL
 
-// Touch Adjustment is not supported yet in the chromium port.
-BUGWK78801 SKIP : touchadjustment/ = FAIL
-
 // Network Information API is not supported yet in the chromium port.
 BUGWK73528 SKIP : networkinformation = PASS FAIL
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index c5ed914..688c71f 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2012-05-14  Terry Anderson  <tdanderson@chromium.org>
+
+        [chromium] Compute the best target node on a GestureTap event
+        https://bugs.webkit.org/show_bug.cgi?id=85101
+
+        Reviewed by Adam Barth.
+
+        Using tests in the touchadjustment/ directory.
+
+        * WebCore.gypi:
+        Include TouchAdjustment.* files.
+        * page/TouchAdjustment.cpp:
+        Included math.h because of an 'Undeclared identifier: INFINITY' when
+        this patch was landed before.
+
 2012-05-14  Adrienne Walker  <enne@google.com>
 
         [chromium] Add compositor debug asserts for blocked main thread

diff --git a/Source/WebCore/WebCore.gypi b/Source/WebCore/WebCore.gypi
index e13307b..df5ccc5 100644 (file)
--- a/Source/WebCore/WebCore.gypi
+++ b/Source/WebCore/WebCore.gypi
@@ -3056,6 +3056,8 @@
             'page/SpeechInputResultList.h',
             'page/SuspendableTimer.cpp',
             'page/SuspendableTimer.h',
+            'page/TouchAdjustment.cpp',
+            'page/TouchAdjustment.h',
             'page/UserContentURLPattern.cpp',
             'page/WebKitAnimation.cpp',
             'page/WebKitAnimation.h',

diff --git a/Source/WebCore/page/TouchAdjustment.cpp b/Source/WebCore/page/TouchAdjustment.cpp
index 587003b..97a1303 100644 (file)
--- a/Source/WebCore/page/TouchAdjustment.cpp
+++ b/Source/WebCore/page/TouchAdjustment.cpp
@@ -34,6 +34,7 @@
 #include "RenderBox.h"
 #include "RenderObject.h"
 #include "RenderStyle.h"
+#include <math.h>
 
 namespace WebCore {
 

diff --git a/Source/WebKit/chromium/ChangeLog b/Source/WebKit/chromium/ChangeLog
index eb64145..48a9f79 100644 (file)
--- a/Source/WebKit/chromium/ChangeLog
+++ b/Source/WebKit/chromium/ChangeLog
@@ -1,3 +1,17 @@
+2012-05-14  Terry Anderson  <tdanderson@chromium.org>
+
+        [chromium] Compute the best target node on a GestureTap event
+        https://bugs.webkit.org/show_bug.cgi?id=85101
+
+        Reviewed by Adam Barth.
+
+        * features.gypi:
+        Enable the touch adjustment code by default.
+        * src/WebInputEventConversion.cpp:
+        (WebKit::PlatformGestureEventBuilder::PlatformGestureEventBuilder):
+        In the case of a GestureTap, deltaX represents the horizontal padding of the touch
+        area and deltaY represents the vertical padding of the touch area.
+
 2012-05-14  Adrienne Walker  <enne@google.com>
 
         [chromium] Add compositor debug asserts for blocked main thread

diff --git a/Source/WebKit/chromium/features.gypi b/Source/WebKit/chromium/features.gypi
index 3947a38..7331807 100644 (file)
--- a/Source/WebKit/chromium/features.gypi
+++ b/Source/WebKit/chromium/features.gypi
@@ -97,6 +97,7 @@
       'ENABLE_STYLE_SCOPED=1',
       'ENABLE_SVG=<(enable_svg)',
       'ENABLE_SVG_FONTS=<(enable_svg)',
+      'ENABLE_TOUCH_ADJUSTMENT=1',
       'ENABLE_TOUCH_EVENTS=<(enable_touch_events)',
       'ENABLE_TOUCH_ICON_LOADING=<(enable_touch_icon_loading)',
       'ENABLE_V8_SCRIPT_DEBUG_SERVER=1',

diff --git a/Source/WebKit/chromium/src/WebInputEventConversion.cpp b/Source/WebKit/chromium/src/WebInputEventConversion.cpp
index b4055a9..96f4326 100644 (file)
--- a/Source/WebKit/chromium/src/WebInputEventConversion.cpp
+++ b/Source/WebKit/chromium/src/WebInputEventConversion.cpp
@@ -148,6 +148,7 @@ PlatformGestureEventBuilder::PlatformGestureEventBuilder(Widget* widget, const W
         break;
     case WebInputEvent::GestureTap:
         m_type = PlatformEvent::GestureTap;
+        m_area = IntSize(e.deltaX * 2, e.deltaY * 2);
         break;
     case WebInputEvent::GestureTapDown:
         m_type = PlatformEvent::GestureTapDown;