diff options
Diffstat (limited to 'WebCore/page/EventHandler.h')
| -rw-r--r-- | WebCore/page/EventHandler.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h index 55c6b20..5348502 100644 --- a/WebCore/page/EventHandler.h +++ b/WebCore/page/EventHandler.h @@ -106,15 +106,11 @@ public: void dispatchFakeMouseMoveEventSoonInQuad(const FloatQuad&); -<<<<<<< HEAD:WebCore/page/EventHandler.h #ifdef ANDROID_HITTEST_WITHSIZE - HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, const IntSize& pointPadding = IntSize()); + HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, int hitType = HitTestRequest::ReadOnly | HitTestRequest::Active, const IntSize& pointPadding = IntSize()); #else - HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars); -#endif -======= HitTestResult hitTestResultAtPoint(const IntPoint&, bool allowShadowContent, bool ignoreClipping = false, HitTestScrollbars scrollbars = DontHitTestScrollbars, int hitType = HitTestRequest::ReadOnly | HitTestRequest::Active); ->>>>>>> webkit.org at r63859:WebCore/page/EventHandler.h +#endif bool mousePressed() const { return m_mousePressed; } void setMousePressed(bool pressed) { m_mousePressed = pressed; } |