diff options
Diffstat (limited to 'WebCore/platform/PlatformTouchPoint.h')
| -rw-r--r-- | WebCore/platform/PlatformTouchPoint.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/WebCore/platform/PlatformTouchPoint.h b/WebCore/platform/PlatformTouchPoint.h index 4b8ebae..f330eb6 100644 --- a/WebCore/platform/PlatformTouchPoint.h +++ b/WebCore/platform/PlatformTouchPoint.h @@ -48,6 +48,11 @@ public: PlatformTouchPoint() {}; #elif PLATFORM(ANDROID) PlatformTouchPoint(unsigned id, const IntPoint& windowPos, State); +<<<<<<< HEAD +======= +#elif PLATFORM(BREWMP) + PlatformTouchPoint(int id, const IntPoint& windowPos, State); +>>>>>>> webkit.org at r68651 #endif unsigned id() const { return m_id; } |