OSDN Git Service

b/3039749 resolving the conflicts for WebKit.
authorHuahui Wu <hwu@google.com>
Mon, 4 Oct 2010 22:23:22 +0000 (15:23 -0700)
committerHuahui Wu <hwu@google.com>
Mon, 4 Oct 2010 22:23:22 +0000 (15:23 -0700)
commitbd2883826a01ef33a513566c75923d6ddec710ad
tree66fea8dd1a8e3a1ace3050edeeeec74e8dca9108
parent5abcebdcce80658b012cd1de400558035899457c
b/3039749 resolving the conflicts for WebKit.

Change-Id: If67e444a050d2a96e7d076c4faee8a160e08d4d5
WebCore/platform/PlatformTouchEvent.h
WebCore/platform/PlatformTouchPoint.h
WebCore/platform/android/PlatformTouchEventAndroid.cpp
WebCore/platform/android/PlatformTouchPointAndroid.cpp