Remove PlatformTouchEvent/Point and use WebTouchEvent/Point instead

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

 /*
  * Copyright (C) 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
  *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ skipping 65 matching lines @@
   const bool newTabModifierSet = metaKey;
 #else
   const bool newTabModifierSet = ctrlKey;
 #endif
   s_newTabModifierSetFromIsolatedWorld |= newTabModifierSet;
 }
 
 void UIEventWithKeyState::setFromPlatformModifiers(
     EventModifierInit& initializer,
     const PlatformEvent::Modifiers modifiers) {
-  if (modifiers & PlatformEvent::CtrlKey)
+  setFromWebInputEventModifiers(
+      initializer, static_cast<WebInputEvent::Modifiers>(modifiers));
+}
+
+void UIEventWithKeyState::setFromWebInputEventModifiers(
+    EventModifierInit& initializer,
+    WebInputEvent::Modifiers modifiers) {
+  if (modifiers & WebInputEvent::ControlKey)
     initializer.setCtrlKey(true);
-  if (modifiers & PlatformEvent::ShiftKey)
+  if (modifiers & WebInputEvent::ShiftKey)
     initializer.setShiftKey(true);
-  if (modifiers & PlatformEvent::AltKey)
+  if (modifiers & WebInputEvent::AltKey)
     initializer.setAltKey(true);
-  if (modifiers & PlatformEvent::MetaKey)
+  if (modifiers & WebInputEvent::MetaKey)
     initializer.setMetaKey(true);
-  if (modifiers & PlatformEvent::AltGrKey)
+  if (modifiers & WebInputEvent::AltGrKey)
     initializer.setModifierAltGraph(true);
-  if (modifiers & PlatformEvent::FnKey)
+  if (modifiers & WebInputEvent::FnKey)
     initializer.setModifierFn(true);
-  if (modifiers & PlatformEvent::CapsLockOn)
+  if (modifiers & WebInputEvent::CapsLockOn)
     initializer.setModifierCapsLock(true);
-  if (modifiers & PlatformEvent::ScrollLockOn)
+  if (modifiers & WebInputEvent::ScrollLockOn)
     initializer.setModifierScrollLock(true);
-  if (modifiers & PlatformEvent::NumLockOn)
+  if (modifiers & WebInputEvent::NumLockOn)
     initializer.setModifierNumLock(true);
-  if (modifiers & PlatformEvent::SymbolKey)
+  if (modifiers & WebInputEvent::SymbolKey)
     initializer.setModifierSymbol(true);
 }
 
 bool UIEventWithKeyState::getModifierState(const String& keyIdentifier) const {
   struct Identifier {
     const char* identifier;
     PlatformEvent::Modifiers mask;
   };
   static const Identifier kIdentifiers[] = {
       {"Shift", PlatformEvent::ShiftKey},
@@ skipping 37 matching lines @@
 }
 
 UIEventWithKeyState* findEventWithKeyState(Event* event) {
   for (Event* e = event; e; e = e->underlyingEvent())
     if (e->isKeyboardEvent() || e->isMouseEvent())
       return static_cast<UIEventWithKeyState*>(e);
   return nullptr;
 }
 
 }  // namespace blink