[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756
benm at google.com
benm at google.com
Fri Feb 26 22:24:15 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit ee9c1c39a45435d5099e0d38549a41b66e579b5a
Author: benm at google.com <benm at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Feb 18 10:21:25 2010 +0000
[v8] [Android] V8 bindings for touch events are missing.
https://bugs.webkit.org/show_bug.cgi?id=33795
Reviewed by Nate Chapin.
No new tests as this just enables touch events in V8. Existing touch tests suffice.
* WebCore.gypi: Add Touch idl files.
* bindings/scripts/CodeGeneratorV8.pm: Add TouchList to typeCanFailConversion map.
* bindings/v8/DOMObjectsInclude.h: Add touch headers.
* bindings/v8/DerivedSourcesAllInOne.cpp: Add touch generated bindings.
* bindings/v8/V8Index.h: Add touch DOM object types.
* bindings/v8/custom/V8EventCustom.cpp: Add conversion of event to touch event.
* Android.derived.jscbindings.mk: Add the touch derived sources to the makefile.
* Android.derived.v8bindings.mk: Add the touch derived sources to the makefile.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54950 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/Android.derived.jscbindings.mk b/WebCore/Android.derived.jscbindings.mk
index 19690bb..866a6ac 100644
--- a/WebCore/Android.derived.jscbindings.mk
+++ b/WebCore/Android.derived.jscbindings.mk
@@ -132,6 +132,9 @@ GEN := \
$(intermediates)/dom/JSRangeException.h \
$(intermediates)/dom/JSText.h \
$(intermediates)/dom/JSTextEvent.h \
+ $(intermediates)/dom/JSTouch.h \
+ $(intermediates)/dom/JSTouchEvent.h \
+ $(intermediates)/dom/JSTouchList.h \
$(intermediates)/dom/JSTreeWalker.h \
$(intermediates)/dom/JSUIEvent.h \
$(intermediates)/dom/JSWebKitAnimationEvent.h \
diff --git a/WebCore/Android.derived.v8bindings.mk b/WebCore/Android.derived.v8bindings.mk
index 303f824..75cba0f 100644
--- a/WebCore/Android.derived.v8bindings.mk
+++ b/WebCore/Android.derived.v8bindings.mk
@@ -113,6 +113,9 @@ GEN := \
$(intermediates)/bindings/V8RangeException.h \
$(intermediates)/bindings/V8Text.h \
$(intermediates)/bindings/V8TextEvent.h \
+ $(intermediates)/bindings/V8Touch.h \
+ $(intermediates)/bindings/V8TouchEvent.h \
+ $(intermediates)/bindings/V8TouchList.h \
$(intermediates)/bindings/V8TreeWalker.h \
$(intermediates)/bindings/V8UIEvent.h \
$(intermediates)/bindings/V8WebKitAnimationEvent.h \
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3628735..6619afb 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,21 @@
+2010-02-18 Ben Murdoch <benm at google.com>
+
+ Reviewed by Nate Chapin.
+
+ [v8] [Android] V8 bindings for touch events are missing.
+ https://bugs.webkit.org/show_bug.cgi?id=33795
+
+ No new tests as this just enables touch events in V8. Existing touch tests suffice.
+
+ * WebCore.gypi: Add Touch idl files.
+ * bindings/scripts/CodeGeneratorV8.pm: Add TouchList to typeCanFailConversion map.
+ * bindings/v8/DOMObjectsInclude.h: Add touch headers.
+ * bindings/v8/DerivedSourcesAllInOne.cpp: Add touch generated bindings.
+ * bindings/v8/V8Index.h: Add touch DOM object types.
+ * bindings/v8/custom/V8EventCustom.cpp: Add conversion of event to touch event.
+ * Android.derived.jscbindings.mk: Add the touch derived sources to the makefile.
+ * Android.derived.v8bindings.mk: Add the touch derived sources to the makefile.
+
2010-02-18 William Chan <willchan at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/WebCore.gypi b/WebCore/WebCore.gypi
index 6191360..76f479d 100644
--- a/WebCore/WebCore.gypi
+++ b/WebCore/WebCore.gypi
@@ -73,6 +73,9 @@
'dom/RangeException.idl',
'dom/Text.idl',
'dom/TextEvent.idl',
+ 'dom/Touch.idl',
+ 'dom/TouchEvent.idl',
+ 'dom/TouchList.idl',
'dom/TreeWalker.idl',
'dom/UIEvent.idl',
'dom/WebKitAnimationEvent.idl',
diff --git a/WebCore/bindings/scripts/CodeGeneratorV8.pm b/WebCore/bindings/scripts/CodeGeneratorV8.pm
index 269687f..2b89b54 100644
--- a/WebCore/bindings/scripts/CodeGeneratorV8.pm
+++ b/WebCore/bindings/scripts/CodeGeneratorV8.pm
@@ -2460,6 +2460,7 @@ my %typeCanFailConversion = (
"SVGPreserveAspectRatio" => 1,
"SVGRect" => 1,
"SVGTransform" => 1,
+ "TouchList" => 0,
"VoidCallback" => 1,
"WebKitCSSMatrix" => 0,
"WebKitPoint" => 0,
diff --git a/WebCore/bindings/v8/DOMObjectsInclude.h b/WebCore/bindings/v8/DOMObjectsInclude.h
index d3d14cd..7e540e2 100644
--- a/WebCore/bindings/v8/DOMObjectsInclude.h
+++ b/WebCore/bindings/v8/DOMObjectsInclude.h
@@ -282,6 +282,12 @@
#include "InspectorFrontendHost.h"
#endif // INSPECTOR
+#if ENABLE(TOUCH_EVENTS)
+#include "Touch.h"
+#include "TouchEvent.h"
+#include "TouchList.h"
+#endif
+
namespace WebCore {
// A helper class for undetectable document.all
diff --git a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
index 9658b19..b626499 100644
--- a/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
+++ b/WebCore/bindings/v8/DerivedSourcesAllInOne.cpp
@@ -219,6 +219,9 @@
#include "bindings/V8TextEvent.cpp"
#include "bindings/V8TextMetrics.cpp"
#include "bindings/V8TimeRanges.cpp"
+#include "bindings/V8Touch.cpp"
+#include "bindings/V8TouchEvent.cpp"
+#include "bindings/V8TouchList.cpp"
#include "bindings/V8TreeWalker.cpp"
#include "bindings/V8UIEvent.cpp"
#include "bindings/V8ValidityState.cpp"
diff --git a/WebCore/bindings/v8/V8Index.h b/WebCore/bindings/v8/V8Index.h
index 950b341..507010e 100644
--- a/WebCore/bindings/v8/V8Index.h
+++ b/WebCore/bindings/v8/V8Index.h
@@ -526,6 +526,15 @@ static const int v8DefaultWrapperInternalFieldCount = 2;
V(GEOPOSITION, Geoposition) \
V(POSITIONERROR, PositionError)
+#if ENABLE(TOUCH_EVENTS)
+#define DOM_OBJECT_TOUCH_EVENT_TYPES(V) \
+ V(TOUCH, Touch) \
+ V(TOUCHEVENT, TouchEvent) \
+ V(TOUCHLIST, TouchList)
+#else
+#define DOM_OBJECT_TOUCH_EVENT_TYPES(V)
+#endif
+
#define DOM_OBJECT_TYPES(V) \
DOM_OBJECT_TYPES_1(V) \
DOM_OBJECT_TYPES_2(V) \
@@ -537,7 +546,8 @@ static const int v8DefaultWrapperInternalFieldCount = 2;
DOM_OBJECT_XPATH_TYPES(V) \
DOM_OBJECT_XSLT_TYPES(V) \
DOM_OBJECT_INSPECTOR_TYPES(V) \
- DOM_OBJECT_GEOLOCATION_TYPES(V)
+ DOM_OBJECT_GEOLOCATION_TYPES(V) \
+ DOM_OBJECT_TOUCH_EVENT_TYPES(V)
#if ENABLE(SVG)
// SVG_OBJECT_TYPES are svg non-node, non-pod types.
diff --git a/WebCore/bindings/v8/custom/V8EventCustom.cpp b/WebCore/bindings/v8/custom/V8EventCustom.cpp
index a13603e..79bddc0 100644
--- a/WebCore/bindings/v8/custom/V8EventCustom.cpp
+++ b/WebCore/bindings/v8/custom/V8EventCustom.cpp
@@ -51,6 +51,7 @@
#include "V8SVGZoomEvent.h"
#include "V8StorageEvent.h"
#include "V8TextEvent.h"
+#include "V8TouchEvent.h"
#include "V8UIEvent.h"
#include "V8WebKitAnimationEvent.h"
#include "V8WebKitTransitionEvent.h"
@@ -104,6 +105,10 @@ v8::Handle<v8::Value> toV8(Event* impl)
#endif
if (impl->isCompositionEvent())
return toV8(static_cast<CompositionEvent*>(impl));
+#if ENABLE(TOUCH_EVENTS)
+ if (impl->isTouchEvent())
+ return toV8(static_cast<TouchEvent*>(impl));
+#endif
return toV8(static_cast<UIEvent*>(impl));
}
if (impl->isMutationEvent())
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list