OSDN Git Service

Merge webkit.org at r54127 : Merge conflicts due to longpress and doubletap touchevents
authorSteve Block <steveblock@google.com>
Wed, 3 Feb 2010 19:21:02 +0000 (19:21 +0000)
committerSteve Block <steveblock@google.com>
Thu, 4 Feb 2010 15:07:00 +0000 (15:07 +0000)
commit1198b35477e381f4af724f65d426996ea16716de
treeccbf065823b1473f1822b2ff38e100a675eedce6
parent4247478b67d5b291c805d149cd09b6ac249d007d
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
WebCore/dom/EventNames.h
WebCore/dom/TouchEvent.cpp
WebCore/dom/TouchEvent.h
WebCore/page/EventHandler.cpp
WebCore/platform/PlatformTouchEvent.h