diff options
| author | Steve Block <steveblock@google.com> | 2010-02-02 18:31:56 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:07:00 +0000 |
| commit | 2b08bb37d88be143f20b58ad7608aff476ca8a96 (patch) | |
| tree | 5c7370411101e10edc32de553c17cbcd6a666cde | |
| parent | 9436923afbaf725afc7f71307ebc992c0c7ee1fa (diff) | |
| download | external_webkit-2b08bb37d88be143f20b58ad7608aff476ca8a96.zip external_webkit-2b08bb37d88be143f20b58ad7608aff476ca8a96.tar.gz external_webkit-2b08bb37d88be143f20b58ad7608aff476ca8a96.tar.bz2 | |
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
| -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; |