diff options
| author | Steve Block <steveblock@google.com> | 2010-02-03 19:28:15 +0000 |
|---|---|---|
| committer | Steve Block <steveblock@google.com> | 2010-02-04 15:07:01 +0000 |
| commit | a161eb599140267f553b1efb6458ab4a899d700a (patch) | |
| tree | c9c5f747564982c616a16600ad58b15bedd91061 /WebCore/platform | |
| parent | 8b17ffea299c44342b5479322adcb686277df548 (diff) | |
| download | external_webkit-a161eb599140267f553b1efb6458ab4a899d700a.zip external_webkit-a161eb599140267f553b1efb6458ab4a899d700a.tar.gz external_webkit-a161eb599140267f553b1efb6458ab4a899d700a.tar.bz2 | |
Merge webkit.org at r54127 : Fix conflicts with Android addition of touch event time
This is not yet upstreamed, so we keep ours.
See https://android-git.corp.google.com/g/#change,39424
Change-Id: I65233af30227b7dd84a1c2b29e5dfc6da20e905e
Diffstat (limited to 'WebCore/platform')
| -rw-r--r-- | WebCore/platform/PlatformTouchEvent.h | 10 | ||||
| -rw-r--r-- | WebCore/platform/android/PlatformTouchEventAndroid.cpp | 7 |
2 files changed, 0 insertions, 17 deletions
diff --git a/WebCore/platform/PlatformTouchEvent.h b/WebCore/platform/PlatformTouchEvent.h index d72855b..854db3c 100644 --- a/WebCore/platform/PlatformTouchEvent.h +++ b/WebCore/platform/PlatformTouchEvent.h @@ -60,12 +60,8 @@ public: #if PLATFORM(QT) PlatformTouchEvent(QTouchEvent*); #elif PLATFORM(ANDROID) -<<<<<<< HEAD // TODO (benm): eventTime is new and needs to be upstream PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State, long eventTime); -======= - PlatformTouchEvent(const IntPoint& windowPos, TouchEventType, PlatformTouchPoint::State); ->>>>>>> webkit.org at r54127 #endif TouchEventType type() const { return m_type; } @@ -76,11 +72,8 @@ public: bool shiftKey() const { return m_shiftKey; } bool metaKey() const { return m_metaKey; } -<<<<<<< HEAD long eventTime() const { return m_eventTime; } -======= ->>>>>>> webkit.org at r54127 private: TouchEventType m_type; Vector<PlatformTouchPoint> m_touchPoints; @@ -88,10 +81,7 @@ private: bool m_altKey; bool m_shiftKey; bool m_metaKey; -<<<<<<< HEAD long m_eventTime; -======= ->>>>>>> webkit.org at r54127 }; } diff --git a/WebCore/platform/android/PlatformTouchEventAndroid.cpp b/WebCore/platform/android/PlatformTouchEventAndroid.cpp index 1ff87c3..d2fcebb 100644 --- a/WebCore/platform/android/PlatformTouchEventAndroid.cpp +++ b/WebCore/platform/android/PlatformTouchEventAndroid.cpp @@ -30,21 +30,14 @@ namespace WebCore { -<<<<<<< HEAD // TODO (benm): eventTime is new and needs to be upstream PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state, long eventTime) -======= -PlatformTouchEvent::PlatformTouchEvent(const IntPoint& windowPos, TouchEventType type, PlatformTouchPoint::State state) ->>>>>>> webkit.org at r54127 : m_type(type) , m_ctrlKey(false) , m_altKey(false) , m_shiftKey(false) , m_metaKey(false) -<<<<<<< HEAD , m_eventTime(eventTime) -======= ->>>>>>> webkit.org at r54127 { m_touchPoints.append(PlatformTouchPoint(windowPos, state)); } |