Rename WebKit namespace to blink (part 3)

content/browser/renderer_host/ui_events_helper.cc

Index: content/browser/renderer_host/ui_events_helper.cc
diff --git a/content/browser/renderer_host/ui_events_helper.cc b/content/browser/renderer_host/ui_events_helper.cc
index d1fbcfa0279e46ad345c774f363ff0cd7d1d6f1a..1dc312db591daabf48892bc815ccfab42c2695ef 100644
--- a/content/browser/renderer_host/ui_events_helper.cc
+++ b/content/browser/renderer_host/ui_events_helper.cc
@@ -13,39 +13,39 @@ namespace {
 int WebModifiersToUIFlags(int modifiers) {
   int flags = ui::EF_NONE;
 
-  if (modifiers & WebKit::WebInputEvent::ShiftKey)
+  if (modifiers & blink::WebInputEvent::ShiftKey)
     flags |= ui::EF_SHIFT_DOWN;
-  if (modifiers & WebKit::WebInputEvent::ControlKey)
+  if (modifiers & blink::WebInputEvent::ControlKey)
     flags |= ui::EF_CONTROL_DOWN;
-  if (modifiers & WebKit::WebInputEvent::AltKey)
+  if (modifiers & blink::WebInputEvent::AltKey)
     flags |= ui::EF_ALT_DOWN;
 
-  if (modifiers & WebKit::WebInputEvent::LeftButtonDown)
+  if (modifiers & blink::WebInputEvent::LeftButtonDown)
     flags |= ui::EF_LEFT_MOUSE_BUTTON;
-  if (modifiers & WebKit::WebInputEvent::RightButtonDown)
+  if (modifiers & blink::WebInputEvent::RightButtonDown)
     flags |= ui::EF_RIGHT_MOUSE_BUTTON;
-  if (modifiers & WebKit::WebInputEvent::MiddleButtonDown)
+  if (modifiers & blink::WebInputEvent::MiddleButtonDown)
     flags |= ui::EF_MIDDLE_MOUSE_BUTTON;
 
-  if (modifiers & WebKit::WebInputEvent::CapsLockOn)
+  if (modifiers & blink::WebInputEvent::CapsLockOn)
     flags |= ui::EF_CAPS_LOCK_DOWN;
 
   return flags;
 }
 
 ui::EventType WebTouchPointStateToEventType(
-    WebKit::WebTouchPoint::State state) {
+    blink::WebTouchPoint::State state) {
   switch (state) {
-    case WebKit::WebTouchPoint::StateReleased:
+    case blink::WebTouchPoint::StateReleased:
       return ui::ET_TOUCH_RELEASED;
 
-    case WebKit::WebTouchPoint::StatePressed:
+    case blink::WebTouchPoint::StatePressed:
       return ui::ET_TOUCH_PRESSED;
 
-    case WebKit::WebTouchPoint::StateMoved:
+    case blink::WebTouchPoint::StateMoved:
       return ui::ET_TOUCH_MOVED;
 
-    case WebKit::WebTouchPoint::StateCancelled:
+    case blink::WebTouchPoint::StateCancelled:
       return ui::ET_TOUCH_CANCELLED;
 
     default:
@@ -53,35 +53,35 @@ ui::EventType WebTouchPointStateToEventType(
   }
 }
 
-WebKit::WebTouchPoint::State TouchPointStateFromEvent(
+blink::WebTouchPoint::State TouchPointStateFromEvent(
     const ui::TouchEvent& event) {
   switch (event.type()) {
     case ui::ET_TOUCH_PRESSED:
-      return WebKit::WebTouchPoint::StatePressed;
+      return blink::WebTouchPoint::StatePressed;
     case ui::ET_TOUCH_RELEASED:
-      return WebKit::WebTouchPoint::StateReleased;
+      return blink::WebTouchPoint::StateReleased;
     case ui::ET_TOUCH_MOVED:
-      return WebKit::WebTouchPoint::StateMoved;
+      return blink::WebTouchPoint::StateMoved;
     case ui::ET_TOUCH_CANCELLED:
-      return WebKit::WebTouchPoint::StateCancelled;
+      return blink::WebTouchPoint::StateCancelled;
     default:
-      return WebKit::WebTouchPoint::StateUndefined;
+      return blink::WebTouchPoint::StateUndefined;
   }
 }
 
-WebKit::WebInputEvent::Type TouchEventTypeFromEvent(
+blink::WebInputEvent::Type TouchEventTypeFromEvent(
     const ui::TouchEvent& event) {
   switch (event.type()) {
     case ui::ET_TOUCH_PRESSED:
-      return WebKit::WebInputEvent::TouchStart;
+      return blink::WebInputEvent::TouchStart;
     case ui::ET_TOUCH_RELEASED:
-      return WebKit::WebInputEvent::TouchEnd;
+      return blink::WebInputEvent::TouchEnd;
     case ui::ET_TOUCH_MOVED:
-      return WebKit::WebInputEvent::TouchMove;
+      return blink::WebInputEvent::TouchMove;
     case ui::ET_TOUCH_CANCELLED:
-      return WebKit::WebInputEvent::TouchCancel;
+      return blink::WebInputEvent::TouchCancel;
     default:
-      return WebKit::WebInputEvent::Undefined;
+      return blink::WebInputEvent::Undefined;
   }
 }
 
@@ -93,19 +93,19 @@ bool MakeUITouchEventsFromWebTouchEvents(
     const TouchEventWithLatencyInfo& touch_with_latency,
     ScopedVector<ui::TouchEvent>* list,
     TouchEventCoordinateSystem coordinate_system) {
-  const WebKit::WebTouchEvent& touch = touch_with_latency.event;
+  const blink::WebTouchEvent& touch = touch_with_latency.event;
   ui::EventType type = ui::ET_UNKNOWN;
   switch (touch.type) {
-    case WebKit::WebInputEvent::TouchStart:
+    case blink::WebInputEvent::TouchStart:
       type = ui::ET_TOUCH_PRESSED;
       break;
-    case WebKit::WebInputEvent::TouchEnd:
+    case blink::WebInputEvent::TouchEnd:
       type = ui::ET_TOUCH_RELEASED;
       break;
-    case WebKit::WebInputEvent::TouchMove:
+    case blink::WebInputEvent::TouchMove:
       type = ui::ET_TOUCH_MOVED;
       break;
-    case WebKit::WebInputEvent::TouchCancel:
+    case blink::WebInputEvent::TouchCancel:
       type = ui::ET_TOUCH_CANCELLED;
       break;
     default:
@@ -117,7 +117,7 @@ bool MakeUITouchEventsFromWebTouchEvents(
   base::TimeDelta timestamp = base::TimeDelta::FromMicroseconds(
       static_cast<int64>(touch.timeStampSeconds * 1000000));
   for (unsigned i = 0; i < touch.touchesLength; ++i) {
-    const WebKit::WebTouchPoint& point = touch.touches[i];
+    const blink::WebTouchPoint& point = touch.touches[i];
     if (WebTouchPointStateToEventType(point.state) != type)
       continue;
     // In aura, the touch-event needs to be in the screen coordinate, since the
@@ -148,79 +148,79 @@ bool MakeUITouchEventsFromWebTouchEvents(
   return true;
 }
 
-WebKit::WebGestureEvent MakeWebGestureEventFromUIEvent(
+blink::WebGestureEvent MakeWebGestureEventFromUIEvent(
     const ui::GestureEvent& event) {
-  WebKit::WebGestureEvent gesture_event;
+  blink::WebGestureEvent gesture_event;
 
   switch (event.type()) {
     case ui::ET_GESTURE_TAP:
-      gesture_event.type = WebKit::WebInputEvent::GestureTap;
+      gesture_event.type = blink::WebInputEvent::GestureTap;
       gesture_event.data.tap.tapCount = event.details().tap_count();
       gesture_event.data.tap.width = event.details().bounding_box().width();
       gesture_event.data.tap.height = event.details().bounding_box().height();
       break;
     case ui::ET_GESTURE_TAP_DOWN:
-      gesture_event.type = WebKit::WebInputEvent::GestureTapDown;
+      gesture_event.type = blink::WebInputEvent::GestureTapDown;
       gesture_event.data.tapDown.width =
           event.details().bounding_box().width();
       gesture_event.data.tapDown.height =
           event.details().bounding_box().height();
       break;
     case ui::ET_GESTURE_SHOW_PRESS:
-      gesture_event.type = WebKit::WebInputEvent::GestureShowPress;
+      gesture_event.type = blink::WebInputEvent::GestureShowPress;
       gesture_event.data.showPress.width =
           event.details().bounding_box().width();
       gesture_event.data.showPress.height =
           event.details().bounding_box().height();
       break;
     case ui::ET_GESTURE_TAP_CANCEL:
-      gesture_event.type = WebKit::WebInputEvent::GestureTapCancel;
+      gesture_event.type = blink::WebInputEvent::GestureTapCancel;
       break;
     case ui::ET_GESTURE_SCROLL_BEGIN:
-      gesture_event.type = WebKit::WebInputEvent::GestureScrollBegin;
+      gesture_event.type = blink::WebInputEvent::GestureScrollBegin;
       break;
     case ui::ET_GESTURE_SCROLL_UPDATE:
-      gesture_event.type = WebKit::WebInputEvent::GestureScrollUpdate;
+      gesture_event.type = blink::WebInputEvent::GestureScrollUpdate;
       gesture_event.data.scrollUpdate.deltaX = event.details().scroll_x();
       gesture_event.data.scrollUpdate.deltaY = event.details().scroll_y();
       break;
     case ui::ET_GESTURE_SCROLL_END:
-      gesture_event.type = WebKit::WebInputEvent::GestureScrollEnd;
+      gesture_event.type = blink::WebInputEvent::GestureScrollEnd;
       break;
     case ui::ET_GESTURE_PINCH_BEGIN:
-      gesture_event.type = WebKit::WebInputEvent::GesturePinchBegin;
+      gesture_event.type = blink::WebInputEvent::GesturePinchBegin;
       break;
     case ui::ET_GESTURE_PINCH_UPDATE:
-      gesture_event.type = WebKit::WebInputEvent::GesturePinchUpdate;
+      gesture_event.type = blink::WebInputEvent::GesturePinchUpdate;
       gesture_event.data.pinchUpdate.scale = event.details().scale();
       break;
     case ui::ET_GESTURE_PINCH_END:
-      gesture_event.type = WebKit::WebInputEvent::GesturePinchEnd;
+      gesture_event.type = blink::WebInputEvent::GesturePinchEnd;
       break;
     case ui::ET_SCROLL_FLING_START:
-      gesture_event.type = WebKit::WebInputEvent::GestureFlingStart;
+      gesture_event.type = blink::WebInputEvent::GestureFlingStart;
       gesture_event.data.flingStart.velocityX = event.details().velocity_x();
       gesture_event.data.flingStart.velocityY = event.details().velocity_y();
       break;
     case ui::ET_SCROLL_FLING_CANCEL:
-      gesture_event.type = WebKit::WebInputEvent::GestureFlingCancel;
+      gesture_event.type = blink::WebInputEvent::GestureFlingCancel;
       break;
     case ui::ET_GESTURE_LONG_PRESS:
-      gesture_event.type = WebKit::WebInputEvent::GestureLongPress;
+      gesture_event.type = blink::WebInputEvent::GestureLongPress;
       gesture_event.data.longPress.width =
           event.details().bounding_box().width();
       gesture_event.data.longPress.height =
           event.details().bounding_box().height();
       break;
     case ui::ET_GESTURE_LONG_TAP:
-      gesture_event.type = WebKit::WebInputEvent::GestureLongTap;
+      gesture_event.type = blink::WebInputEvent::GestureLongTap;
       gesture_event.data.longPress.width =
           event.details().bounding_box().width();
       gesture_event.data.longPress.height =
           event.details().bounding_box().height();
       break;
     case ui::ET_GESTURE_TWO_FINGER_TAP:
-      gesture_event.type = WebKit::WebInputEvent::GestureTwoFingerTap;
+      gesture_event.type = blink::WebInputEvent::GestureTwoFingerTap;
       gesture_event.data.twoFingerTap.firstFingerWidth =
           event.details().first_finger_width();
       gesture_event.data.twoFingerTap.firstFingerHeight =
@@ -229,13 +229,13 @@ WebKit::WebGestureEvent MakeWebGestureEventFromUIEvent(
     case ui::ET_GESTURE_BEGIN:
     case ui::ET_GESTURE_END:
     case ui::ET_GESTURE_MULTIFINGER_SWIPE:
-      gesture_event.type = WebKit::WebInputEvent::Undefined;
+      gesture_event.type = blink::WebInputEvent::Undefined;
       break;
     default:
       NOTREACHED() << "Unknown gesture type: " << event.type();
   }
 
-  gesture_event.sourceDevice = WebKit::WebGestureEvent::Touchscreen;
+  gesture_event.sourceDevice = blink::WebGestureEvent::Touchscreen;
   gesture_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
   gesture_event.timeStampSeconds = event.time_stamp().InSecondsF();
 
@@ -246,31 +246,31 @@ int EventFlagsToWebEventModifiers(int flags) {
   int modifiers = 0;
 
   if (flags & ui::EF_SHIFT_DOWN)
-    modifiers |= WebKit::WebInputEvent::ShiftKey;
+    modifiers |= blink::WebInputEvent::ShiftKey;
   if (flags & ui::EF_CONTROL_DOWN)
-    modifiers |= WebKit::WebInputEvent::ControlKey;
+    modifiers |= blink::WebInputEvent::ControlKey;
   if (flags & ui::EF_ALT_DOWN)
-    modifiers |= WebKit::WebInputEvent::AltKey;
+    modifiers |= blink::WebInputEvent::AltKey;
   // TODO(beng): MetaKey/META_MASK
   if (flags & ui::EF_LEFT_MOUSE_BUTTON)
-    modifiers |= WebKit::WebInputEvent::LeftButtonDown;
+    modifiers |= blink::WebInputEvent::LeftButtonDown;
   if (flags & ui::EF_MIDDLE_MOUSE_BUTTON)
-    modifiers |= WebKit::WebInputEvent::MiddleButtonDown;
+    modifiers |= blink::WebInputEvent::MiddleButtonDown;
   if (flags & ui::EF_RIGHT_MOUSE_BUTTON)
-    modifiers |= WebKit::WebInputEvent::RightButtonDown;
+    modifiers |= blink::WebInputEvent::RightButtonDown;
   if (flags & ui::EF_CAPS_LOCK_DOWN)
-    modifiers |= WebKit::WebInputEvent::CapsLockOn;
+    modifiers |= blink::WebInputEvent::CapsLockOn;
   return modifiers;
 }
 
-WebKit::WebTouchPoint* UpdateWebTouchEventFromUIEvent(
+blink::WebTouchPoint* UpdateWebTouchEventFromUIEvent(
     const ui::TouchEvent& event,
-    WebKit::WebTouchEvent* web_event) {
-  WebKit::WebTouchPoint* point = NULL;
+    blink::WebTouchEvent* web_event) {
+  blink::WebTouchPoint* point = NULL;
   switch (event.type()) {
     case ui::ET_TOUCH_PRESSED:
       // Add a new touch point.
-      if (web_event->touchesLength < WebKit::WebTouchEvent::touchesLengthCap) {
+      if (web_event->touchesLength < blink::WebTouchEvent::touchesLengthCap) {
         point = &web_event->touches[web_event->touchesLength++];
         point->id = event.touch_id();
       }
@@ -306,7 +306,7 @@ WebKit::WebTouchPoint* UpdateWebTouchEventFromUIEvent(
 
   // Update the location and state of the point.
   point->state = TouchPointStateFromEvent(event);
-  if (point->state == WebKit::WebTouchPoint::StateMoved) {
+  if (point->state == blink::WebTouchPoint::StateMoved) {
     // It is possible for badly written touch drivers to emit Move events even
     // when the touch location hasn't changed. In such cases, consume the event
     // and pretend nothing happened.
@@ -322,9 +322,9 @@ WebKit::WebTouchPoint* UpdateWebTouchEventFromUIEvent(
 
   // Mark the rest of the points as stationary.
   for (unsigned i = 0; i < web_event->touchesLength; ++i) {
-    WebKit::WebTouchPoint* iter = web_event->touches + i;
+    blink::WebTouchPoint* iter = web_event->touches + i;
     if (iter != point)
-      iter->state = WebKit::WebTouchPoint::StateStationary;
+      iter->state = blink::WebTouchPoint::StateStationary;
   }
 
   // Update the type of the touch event.