diff options
Diffstat (limited to 'WebCore/dom/EventNames.h')
| -rw-r--r-- | WebCore/dom/EventNames.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/dom/EventNames.h b/WebCore/dom/EventNames.h index c8c3291..4a0a042 100644 --- a/WebCore/dom/EventNames.h +++ b/WebCore/dom/EventNames.h @@ -150,10 +150,15 @@ namespace WebCore { macro(touchmove) \ macro(touchend) \ macro(touchcancel) \ +<<<<<<< HEAD /* #if PLATFORM(ANDROID) */ \ macro(touchlongpress) \ macro(touchdoubletap) \ /* #endif */ \ +======= + \ + macro(success) \ +>>>>>>> webkit.org at r54127 \ // end of DOM_EVENT_NAMES_FOR_EACH |