Rename WebKit namespace to blink (part 5)

webkit/child/fling_animator_impl_android.cc

 // Copyright (c) 2012 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 "webkit/child/fling_animator_impl_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "jni/OverScroller_jni.h"
@@ skipping 80 matching lines @@
 float FlingAnimatorImpl::GetCurrentVelocity()
 {
   JNIEnv* env = base::android::AttachCurrentThread();
   // TODO(jdduke): Add Java-side hooks for getCurrVelocityX/Y, and return
   //               vector velocity.
   return JNI_OverScroller::Java_OverScroller_getCurrVelocity(
       env, java_scroller_.obj());
 }
 
 bool FlingAnimatorImpl::apply(double time,
-                              WebKit::WebGestureCurveTarget* target) {
+                              blink::WebGestureCurveTarget* target) {
   if (!UpdatePosition())
     return false;
 
   gfx::Point current_position = GetCurrentPosition();
   gfx::Vector2d diff(current_position - last_position_);
   last_position_ = current_position;
   float dpi_scale = gfx::Screen::GetNativeScreen()->GetPrimaryDisplay()
       .device_scale_factor();
-  WebKit::WebFloatSize scroll_amount(diff.x() / dpi_scale,
+  blink::WebFloatSize scroll_amount(diff.x() / dpi_scale,
                                      diff.y() / dpi_scale);
 
   float delta_time = time - last_time_;
   last_time_ = time;
 
   // Currently, the OverScroller only provides the velocity magnitude; use the
   // angle of the scroll delta to yield approximate x and y velocity components.
   // TODO(jdduke): Remove this when we can properly poll OverScroller velocity.
   gfx::PointF current_velocity = last_velocity_;
   if (delta_time > kEpsilon) {
     float diff_length = diff.Length();
     if (diff_length > kEpsilon) {
       float velocity = GetCurrentVelocity();
       float scroll_to_velocity = velocity / diff_length;
       current_velocity = gfx::PointF(diff.x() * scroll_to_velocity,
                                      diff.y() * scroll_to_velocity);
     }
   }
   last_velocity_ = current_velocity;
-  WebKit::WebFloatSize fling_velocity(current_velocity.x() / dpi_scale,
+  blink::WebFloatSize fling_velocity(current_velocity.x() / dpi_scale,
                                       current_velocity.y() / dpi_scale);
   target->notifyCurrentFlingVelocity(fling_velocity);
 
   // scrollBy() could delete this curve if the animation is over, so don't touch
   // any member variables after making that call.
   target->scrollBy(scroll_amount);
   return true;
 }
 
 FlingAnimatorImpl* FlingAnimatorImpl::CreateAndroidGestureCurve(
-    const WebKit::WebFloatPoint& velocity,
-    const WebKit::WebSize&) {
+    const blink::WebFloatPoint& velocity,
+    const blink::WebSize&) {
   FlingAnimatorImpl* gesture_curve = new FlingAnimatorImpl();
   gesture_curve->StartFling(velocity);
   return gesture_curve;
 }
 
 } // namespace webkit_glue