Merge webkit.org at r54127 : Resolve conflicts for handleTouchEvent

On Android, handleTouchEvent returns int, rather than bool.

Change-Id: I8ba16342eac7ccca1c7df3fa36b52ca8192a69b5

diff --git a/WebCore/page/EventHandler.cpp b/WebCore/page/EventHandler.cpp
index 7d45285..26d7261 100644 (file)
--- a/WebCore/page/EventHandler.cpp
+++ b/WebCore/page/EventHandler.cpp
@@ -2555,7 +2555,6 @@ void EventHandler::updateLastScrollbarUnderMouse(Scrollbar* scrollbar, bool setL
 }
 
 #if ENABLE(TOUCH_EVENTS)
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
 // TODO(benm): On Android we return an int back to Java to signify whether the default actions
 // for longpress/doubletap in the Browser should be prevented. I think that before upstreaming
@@ -2564,9 +2563,6 @@ int EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
 #else
 bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
 #endif
-=======
-bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
->>>>>>> webkit.org at r54127
 {
     RefPtr<TouchList> touches = TouchList::create();
     RefPtr<TouchList> pressedTouches = TouchList::create();
@@ -2649,13 +2645,13 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
     }
 
     if (!m_touchEventTarget)
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
         return 0;
 #else
         return false;
 #endif
 
+<<<<<<< HEAD
     bool defaultPrevented = false;
 #if PLATFORM(ANDROID)
     // TODO (benm): We should be able to remove this prior to upstreaming once Java side refactorings to make
@@ -2664,8 +2660,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
     bool doubleTapPrevented = false;
 #endif
 =======
-        return false;
-
     bool defaultPrevented = false;
 >>>>>>> webkit.org at r54127
 

diff --git a/WebCore/page/EventHandler.h b/WebCore/page/EventHandler.h
index ead384c..83f2de8 100644 (file)
--- a/WebCore/page/EventHandler.h
+++ b/WebCore/page/EventHandler.h
@@ -206,17 +206,12 @@ public:
 #endif
 
 #if ENABLE(TOUCH_EVENTS)
-<<<<<<< HEAD
 #if PLATFORM(ANDROID)
     int handleTouchEvent(const PlatformTouchEvent&);
 #else
     bool handleTouchEvent(const PlatformTouchEvent&);
 #endif
 #endif
-=======
-    bool handleTouchEvent(const PlatformTouchEvent&);
-#endif
->>>>>>> webkit.org at r54127
 
 private:
 #if ENABLE(DRAG_SUPPORT)