OSDN Git Service

Merge webkit.org at r54127 : Resolve conflicts for handleTouchEvent
authorSteve Block <steveblock@google.com>
Tue, 2 Feb 2010 18:27:44 +0000 (18:27 +0000)
committerSteve Block <steveblock@google.com>
Thu, 4 Feb 2010 15:06:59 +0000 (15:06 +0000)
commit4247478b67d5b291c805d149cd09b6ac249d007d
tree4f3684826531f058ac03e83cc499d8de0826ac23
parentcae449b1dff813bce2972d779eb121f74e5d3014
Merge webkit.org at r54127 : Resolve conflicts for handleTouchEvent

On Android, handleTouchEvent returns int, rather than bool.

Change-Id: I8ba16342eac7ccca1c7df3fa36b52ca8192a69b5
WebCore/page/EventHandler.cpp
WebCore/page/EventHandler.h