Rename enums/functions that collide in chromium style in platform/

third_party/WebKit/Source/core/events/PointerEventFactory.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/events/PointerEventFactory.h"
 
 namespace blink {
 
 namespace {
 
@@ skipping 63 matching lines @@
     pointerEventInit.setPointerType(pointerTypeNameForWebPointPointerType(pointerType));
     pointerEventInit.setIsPrimary(isPrimary(pointerId));
 }
 
 PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactory::create(
     const AtomicString& mouseEventName, const PlatformMouseEvent& mouseEvent,
     PassRefPtrWillBeRawPtr<EventTarget> relatedTarget,
     PassRefPtrWillBeRawPtr<AbstractView> view)
 {
     AtomicString pointerEventName = pointerEventNameForMouseEventName(mouseEventName);
-    unsigned buttons = MouseEvent::platformModifiersToButtons(mouseEvent.modifiers());
+    unsigned buttons = MouseEvent::platformModifiersToButtons(mouseEvent.getModifiers());
     PointerEventInit pointerEventInit;
 
     setIdTypeButtons(pointerEventInit, mouseEvent.pointerProperties(), buttons);
 
     pointerEventInit.setScreenX(mouseEvent.globalPosition().x());
     pointerEventInit.setScreenY(mouseEvent.globalPosition().y());
     pointerEventInit.setClientX(mouseEvent.position().x());
     pointerEventInit.setClientY(mouseEvent.position().y());
     if (pointerEventName == EventTypeNames::pointerdown
         || pointerEventName == EventTypeNames::pointerup) {
         pointerEventInit.setButton(mouseEvent.button());
     } else {
         // TODO(crbug.com/587955): We are setting NoButton for transition
         // pointerevents should be resolved as part of this bug
         pointerEventInit.setButton(NoButton);
     }
     pointerEventInit.setPressure(getPointerEventPressure(
         mouseEvent.pointerProperties().force, pointerEventInit.buttons()));
 
-    UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, mouseEvent.modifiers());
+    UIEventWithKeyState::setFromPlatformModifiers(pointerEventInit, mouseEvent.getModifiers());
 
     // Make sure chorded buttons fire pointermove instead of pointerup/down.
     if ((pointerEventName == EventTypeNames::pointerdown
         && (buttons & ~MouseEvent::buttonToButtons(mouseEvent.button())) != 0)
         || (pointerEventName == EventTypeNames::pointerup && buttons != 0))
         pointerEventName = EventTypeNames::pointermove;
 
     pointerEventInit.setBubbles(
         pointerEventName != EventTypeNames::pointerenter
         && pointerEventName != EventTypeNames::pointerleave);
     pointerEventInit.setCancelable(
         pointerEventName != EventTypeNames::pointerenter
         && pointerEventName != EventTypeNames::pointerleave
         && pointerEventName != EventTypeNames::pointercancel);
 
     pointerEventInit.setView(view);
     if (relatedTarget)
         pointerEventInit.setRelatedTarget(relatedTarget);
 
     return PointerEvent::create(pointerEventName, pointerEventInit);
 }
 
 PassRefPtrWillBeRawPtr<PointerEvent> PointerEventFactory::create(const AtomicString& type,
     const PlatformTouchPoint& touchPoint, PlatformEvent::Modifiers modifiers,
     const double width, const double height,
     const double clientX, const double clientY)
 {
-    const PlatformTouchPoint::State pointState = touchPoint.state();
+    const PlatformTouchPoint::TouchState pointState = touchPoint.state();
 
     bool pointerReleasedOrCancelled =
         pointState == PlatformTouchPoint::TouchReleased
         || pointState == PlatformTouchPoint::TouchCancelled;
     bool pointerPressedOrReleased =
         pointState == PlatformTouchPoint::TouchPressed
         || pointState == PlatformTouchPoint::TouchReleased;
 
     bool isEnterOrLeave = false;
 
@@ skipping 154 matching lines @@
     return m_pointerIdMapping.contains(pointerId);
 }
 
 bool PointerEventFactory::isActiveButtonsState(const int pointerId)
 {
     return m_pointerIdMapping.contains(pointerId)
         && m_pointerIdMapping.get(pointerId).isActiveButtons;
 }
 
 } // namespace blink