- Revision
- 116983
- Author
- [email protected]
- Date
- 2012-05-14 12:24:16 -0700 (Mon, 14 May 2012)
Log Message
[chromium] Compute the best target node on a GestureTap event
https://bugs.webkit.org/show_bug.cgi?id=85101
Patch by Terry Anderson <[email protected]> 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.
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (116982 => 116983)
--- trunk/LayoutTests/ChangeLog 2012-05-14 19:19:06 UTC (rev 116982)
+++ trunk/LayoutTests/ChangeLog 2012-05-14 19:24:16 UTC (rev 116983)
@@ -1,3 +1,13 @@
+2012-05-14 Terry Anderson <[email protected]>
+
+ [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 <[email protected]>
Unreviewed. Mark one test as failed on chromium.
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (116982 => 116983)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-14 19:19:06 UTC (rev 116982)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-05-14 19:24:16 UTC (rev 116983)
@@ -143,9 +143,6 @@
// 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
Modified: trunk/Source/WebCore/ChangeLog (116982 => 116983)
--- trunk/Source/WebCore/ChangeLog 2012-05-14 19:19:06 UTC (rev 116982)
+++ trunk/Source/WebCore/ChangeLog 2012-05-14 19:24:16 UTC (rev 116983)
@@ -1,3 +1,18 @@
+2012-05-14 Terry Anderson <[email protected]>
+
+ [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 <[email protected]>
[chromium] Add compositor debug asserts for blocked main thread
Modified: trunk/Source/WebCore/WebCore.gypi (116982 => 116983)
--- trunk/Source/WebCore/WebCore.gypi 2012-05-14 19:19:06 UTC (rev 116982)
+++ trunk/Source/WebCore/WebCore.gypi 2012-05-14 19:24:16 UTC (rev 116983)
@@ -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',
Modified: trunk/Source/WebCore/page/TouchAdjustment.cpp (116982 => 116983)
--- trunk/Source/WebCore/page/TouchAdjustment.cpp 2012-05-14 19:19:06 UTC (rev 116982)
+++ trunk/Source/WebCore/page/TouchAdjustment.cpp 2012-05-14 19:24:16 UTC (rev 116983)
@@ -34,6 +34,7 @@
#include "RenderBox.h"
#include "RenderObject.h"
#include "RenderStyle.h"
+#include <math.h>
namespace WebCore {
Modified: trunk/Source/WebKit/chromium/ChangeLog (116982 => 116983)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-14 19:19:06 UTC (rev 116982)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-14 19:24:16 UTC (rev 116983)
@@ -1,3 +1,17 @@
+2012-05-14 Terry Anderson <[email protected]>
+
+ [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 <[email protected]>
[chromium] Add compositor debug asserts for blocked main thread
Modified: trunk/Source/WebKit/chromium/features.gypi (116982 => 116983)
--- trunk/Source/WebKit/chromium/features.gypi 2012-05-14 19:19:06 UTC (rev 116982)
+++ trunk/Source/WebKit/chromium/features.gypi 2012-05-14 19:24:16 UTC (rev 116983)
@@ -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',
Modified: trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp (116982 => 116983)
--- trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp 2012-05-14 19:19:06 UTC (rev 116982)
+++ trunk/Source/WebKit/chromium/src/WebInputEventConversion.cpp 2012-05-14 19:24:16 UTC (rev 116983)
@@ -148,6 +148,7 @@
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;
