From 2b08bb37d88be143f20b58ad7608aff476ca8a96 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Tue, 2 Feb 2010 18:31:56 +0000 Subject: [PATCH] Merge webkit.org at r54127 : Fix conflicts in touchevents IDL files as GenerateConstructor is no longer required See http://trac.webkit.org/changeset/52537 Change-Id: Id985ac707e30ce100dd06d8e57826af6184c10e6 --- WebCore/dom/Touch.idl | 5 ----- WebCore/dom/TouchEvent.idl | 5 ----- WebCore/dom/TouchList.idl | 4 ---- 3 files changed, 14 deletions(-) diff --git a/WebCore/dom/Touch.idl b/WebCore/dom/Touch.idl index e684d1fe4..1afc63ab4 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 b46d68f62..0e0d91770 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 4bb9e810f..ede7bf2e5 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; -- 2.11.0