Merge WebKit at r75315: Fix conflicts

- HTMLInputElement.cpp
  Conflict due to ANDROID_ACCEPT_CHANGES_TO_FOCUSED_TEXTFIELDS
  See http://trac.webkit.org/changeset/74895

- HTMLInputElement.cpp and RangeInputType.cpp
  Conflict due to refactoring of event handling on input elements
  See http://trac.webkit.org/changeset/74549

- DOMWindow.cpp
  Conflict due to DOMWindow::clearDOMStorage()
  See http://trac.webkit.org/changeset/74800

- EventHandler.cpp
  Conflict due to longpress and doubletap vs touch event refactoring
  See http://trac.webkit.org/changeset/74553

- History.cpp
  Trivial conflict due to cherry-pick
  See http://trac.webkit.org/changeset/74853

- GraphicsContext.cpp
  Conflict due to PLATFORM(ANDROID) guard
  See http://trac.webkit.org/changeset/74662

- InlineTextBox.cpp
  Conflict due to ANDROID_DISABLE_ROUNDING_HACKS
  See http://trac.webkit.org/changeset/74971

Change-Id: I5c1abe54b9d78f667a41e83a871e9a21be0a89d5

3 files changed, 8 insertions, 115 deletions

diff --git a/Source/WebCore/page/DOMWindow.cpp b/Source/WebCore/page/DOMWindow.cpp
index c2e8c39..be6c179 100644
--- a/Source/WebCore/page/DOMWindow.cpp
+++ b/Source/WebCore/page/DOMWindow.cpp
@@ -1634,7 +1634,6 @@ void DOMWindow::revokeObjectURL(const String& blobURLString)
 }
 #endif
 
-<<<<<<< HEAD:WebCore/page/DOMWindow.cpp
 #if ENABLE(DOM_STORAGE) && defined(ANDROID)
 void DOMWindow::clearDOMStorage()
 {
@@ -1648,10 +1647,7 @@ void DOMWindow::clearDOMStorage()
 }
 #endif
 
-void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow)
-=======
 void DOMWindow::setLocation(const String& urlString, DOMWindow* activeWindow, DOMWindow* firstWindow, SetLocationLocking locking)
->>>>>>> webkit.org at r75315:Source/WebCore/page/DOMWindow.cpp
 {
     Frame* activeFrame = activeWindow->frame();
     if (!activeFrame)
diff --git a/Source/WebCore/page/EventHandler.cpp b/Source/WebCore/page/EventHandler.cpp
index ab923ac..a04bcf0 100644
--- a/Source/WebCore/page/EventHandler.cpp
+++ b/Source/WebCore/page/EventHandler.cpp
@@ -2999,113 +2999,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
 
     // Now iterate the changedTouches list and m_targets within it, sending events to the tagets as required.
     bool defaultPrevented = false;
-<<<<<<< HEAD:WebCore/page/EventHandler.cpp
-    Touch* changedTouch = 0;
-    EventTarget* touchEventTarget = 0;
-
-    if (cancelTouches->length() > 0) {
-        // We dispatch the event to the target of the touch that caused this touch event to be generated, i.e.
-        // we take it from the list that will be used as the changedTouches property of the event.
-        // The choice to use the touch at index 0 guarantees that there is a target (as we checked the length
-        // above). In the case that there are multiple touches in what becomes the changedTouches list, it is
-        // difficult to say how we should prioritise touches and as such, item 0 is an arbitrary choice.
-        changedTouch = cancelTouches->item(0);
-        ASSERT(changedTouch);
-        touchEventTarget = changedTouch->target();
-        ASSERT(touchEventTarget);
-
-        eventName = &eventNames().touchcancelEvent;
-        RefPtr<TouchEvent> cancelEv =
-            TouchEvent::create(TouchList::create().get(), TouchList::create().get(), cancelTouches.get(),
-                                                   *eventName, touchEventTarget->toNode()->document()->defaultView(),
-                                                   0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(),
-                                                   event.metaKey());
-        ExceptionCode ec = 0;
-        touchEventTarget->dispatchEvent(cancelEv.get(), ec);
-        defaultPrevented |= cancelEv->defaultPrevented();
-    }
-
-    if (releasedTouches->length() > 0) {
-        Touch* changedTouch = releasedTouches->item(0);
-        ASSERT(changedTouch);
-        touchEventTarget = changedTouch->target();
-        ASSERT(touchEventTarget);
-
-        RefPtr<TouchList> targetTouches = assembleTargetTouches(changedTouch, touches.get());
-
-        eventName = &eventNames().touchendEvent;
-        RefPtr<TouchEvent> endEv = 
-            TouchEvent::create(touches.get(), targetTouches.get(), releasedTouches.get(),
-                                                   *eventName, touchEventTarget->toNode()->document()->defaultView(),
-                                                   0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(),
-                                                   event.metaKey());
-        ExceptionCode ec = 0;
-        touchEventTarget->dispatchEvent(endEv.get(), ec);
-        defaultPrevented |= endEv->defaultPrevented();
-    }
-    if (pressedTouches->length() > 0) {
-        Touch* changedTouch = pressedTouches->item(0);
-        ASSERT(changedTouch);
-        touchEventTarget = changedTouch->target();
-        ASSERT(touchEventTarget);
-
-        RefPtr<TouchList> targetTouches = assembleTargetTouches(changedTouch, touches.get());
-
-#if PLATFORM(ANDROID)
-        if (event.type() == TouchLongPress) {
-            eventName = &eventNames().touchlongpressEvent;
-            RefPtr<TouchEvent> longpressEv =
-                TouchEvent::create(touches.get(), targetTouches.get(), pressedTouches.get(),
-                                                       *eventName, touchEventTarget->toNode()->document()->defaultView(),
-                                                       0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(),
-                                                       event.metaKey());
-            ExceptionCode ec = 0;
-            touchEventTarget->dispatchEvent(longpressEv.get(), ec);
-            defaultPrevented |= longpressEv->defaultPrevented();
-        } else if (event.type() == TouchDoubleTap) {
-            eventName = &eventNames().touchdoubletapEvent;
-            RefPtr<TouchEvent> doubleTapEv =
-                TouchEvent::create(touches.get(), targetTouches.get(), pressedTouches.get(),
-                                                       *eventName, touchEventTarget->toNode()->document()->defaultView(),
-                                                       0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(),
-                                                       event.metaKey());
-            ExceptionCode ec = 0;
-            touchEventTarget->dispatchEvent(doubleTapEv.get(), ec);
-            defaultPrevented |= doubleTapEv->defaultPrevented();
-        } else {
-#endif
-        eventName = &eventNames().touchstartEvent;
-        RefPtr<TouchEvent> startEv =
-            TouchEvent::create(touches.get(), targetTouches.get(), pressedTouches.get(),
-                                                   *eventName, touchEventTarget->toNode()->document()->defaultView(),
-                                                   0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(),
-                                                   event.metaKey());
-        ExceptionCode ec = 0;
-        touchEventTarget->dispatchEvent(startEv.get(), ec);
-        defaultPrevented |= startEv->defaultPrevented();
-#if PLATFORM(ANDROID)
-    }
-#endif
-    }
-
-    if (movedTouches->length() > 0) {
-        Touch* changedTouch = movedTouches->item(0);
-        ASSERT(changedTouch);
-        touchEventTarget = changedTouch->target();
-        ASSERT(touchEventTarget);
-
-        RefPtr<TouchList> targetTouches = assembleTargetTouches(changedTouch, touches.get());
-
-        eventName = &eventNames().touchmoveEvent;
-        RefPtr<TouchEvent> moveEv = 
-            TouchEvent::create(touches.get(), targetTouches.get(), movedTouches.get(),
-                                                   *eventName, touchEventTarget->toNode()->document()->defaultView(),
-                                                   0, 0, 0, 0, event.ctrlKey(), event.altKey(), event.shiftKey(),
-                                                   event.metaKey());
-        ExceptionCode ec = 0;
-        touchEventTarget->dispatchEvent(moveEv.get(), ec);
-        defaultPrevented |= moveEv->defaultPrevented();
-=======
     RefPtr<TouchList> emptyList = TouchList::create();
     for (unsigned state = 0; state != PlatformTouchPoint::TouchStateEnd; ++state) {
         if (!changedTouches[state].m_touches)
@@ -3114,7 +3007,15 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
         // When sending a touch cancel event, use empty touches and targetTouches lists.
         bool isTouchCancelEvent = (state == PlatformTouchPoint::TouchCancelled);
         RefPtr<TouchList>& effectiveTouches(isTouchCancelEvent ? emptyList : touches);
+#if PLATFORM(ANDROID)
+        AtomicString stateName(eventNameForTouchPointState(static_cast<PlatformTouchPoint::State>(state)));
+        if (event.type() == TouchLongPress)
+            stateName = eventNames().touchlongpressEvent;
+        else if (event.type() == TouchDoubleTap)
+            stateName = eventNames().touchdoubletapEvent;
+#else
         const AtomicString& stateName(eventNameForTouchPointState(static_cast<PlatformTouchPoint::State>(state)));
+#endif
         const EventTargetSet& targetsForState = changedTouches[state].m_targets;
 
         for (EventTargetSet::const_iterator it = targetsForState.begin(); it != targetsForState.end(); ++it) {
@@ -3130,7 +3031,6 @@ bool EventHandler::handleTouchEvent(const PlatformTouchEvent& event)
             touchEventTarget->dispatchEvent(touchEvent.get(), ec);
             defaultPrevented |= touchEvent->defaultPrevented();
         }
->>>>>>> webkit.org at r75315:Source/WebCore/page/EventHandler.cpp
     }
 
     return defaultPrevented;
diff --git a/Source/WebCore/page/History.cpp b/Source/WebCore/page/History.cpp
index abbf9ec..1d1e77a 100644
--- a/Source/WebCore/page/History.cpp
+++ b/Source/WebCore/page/History.cpp
@@ -85,10 +85,7 @@ void History::go(int distance)
 {
     if (!m_frame)
         return;
-<<<<<<< HEAD:WebCore/page/History.cpp
-=======
 
->>>>>>> webkit.org at r75315:Source/WebCore/page/History.cpp
     m_frame->navigationScheduler()->scheduleHistoryNavigation(distance);
 }