diff options
| author | Steve Block <steveblock@google.com> | 2010-02-03 19:21:02 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:07:00 +0000 |
| commit | 1198b35477e381f4af724f65d426996ea16716de (patch) | |
| tree | ccbf065823b1473f1822b2ff38e100a675eedce6 /WebCore/platform | |
| parent | 4247478b67d5b291c805d149cd09b6ac249d007d (diff) | |
| download | external_webkit-1198b35477e381f4af724f65d426996ea16716de.zip external_webkit-1198b35477e381f4af724f65d426996ea16716de.tar.gz external_webkit-1198b35477e381f4af724f65d426996ea16716de.tar.bz2 | |
Merge webkit.org at r54127 : Merge conflicts due to longpress and doubletap touchevents
Keep ours as this code has not yet been upstreamed.
Change-Id: Ia05ab6c8c36b2d332fec2fe4c16ceacff2933382
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/PlatformTouchEvent.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index 263dee0..d72855b 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -42,13 +42,10 @@ enum TouchEventType { , TouchMove , TouchEnd , TouchCancel -<<<<<<< HEAD #if PLATFORM(ANDROID) , TouchLongPress , TouchDoubleTap #endif -======= ->>>>>>> webkit.org at r54127 }; class PlatformTouchEvent { |