diff options
| -rw-r--r-- | WebCore/dom/Touch.idl | 5 | ||||
| -rw-r--r-- | WebCore/dom/TouchEvent.idl | 5 | ||||
| -rw-r--r-- | WebCore/dom/TouchList.idl | 4 |
3 files changed, 0 insertions, 14 deletions
diff --git a/WebCore/dom/Touch.idl b/WebCore/dom/Touch.idl index e684d1f..1afc63a 100644 --- a/WebCore/dom/Touch.idl +++ b/WebCore/dom/Touch.idl @@ -26,12 +26,7 @@ module events { interface [ -<<<<<<< HEAD - Conditional=TOUCH_EVENTS, - GenerateConstructor -======= Conditional=TOUCH_EVENTS ->>>>>>> webkit.org at r54127 ] Touch { readonly attribute long clientX; readonly attribute long clientY; diff --git a/WebCore/dom/TouchEvent.idl b/WebCore/dom/TouchEvent.idl index b46d68f..0e0d917 100644 --- a/WebCore/dom/TouchEvent.idl +++ b/WebCore/dom/TouchEvent.idl @@ -26,12 +26,7 @@ module events { interface [ -<<<<<<< HEAD - Conditional=TOUCH_EVENTS, - GenerateConstructor -======= Conditional=TOUCH_EVENTS ->>>>>>> webkit.org at r54127 ] TouchEvent : UIEvent { readonly attribute TouchList touches; readonly attribute TouchList targetTouches; diff --git a/WebCore/dom/TouchList.idl b/WebCore/dom/TouchList.idl index 4bb9e81..ede7bf2 100644 --- a/WebCore/dom/TouchList.idl +++ b/WebCore/dom/TouchList.idl @@ -27,10 +27,6 @@ module events { interface [ Conditional=TOUCH_EVENTS, -<<<<<<< HEAD - GenerateConstructor, -======= ->>>>>>> webkit.org at r54127 HasIndexGetter ] TouchList { readonly attribute unsigned long length; |