Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1274)

Unified Diff: webkit/child/fling_animator_impl_android.cc

Issue 61553006: Rename WebKit namespace to blink (part 5) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « webkit/child/fling_animator_impl_android.h ('k') | webkit/child/fling_curve_configuration.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: webkit/child/fling_animator_impl_android.cc
diff --git a/webkit/child/fling_animator_impl_android.cc b/webkit/child/fling_animator_impl_android.cc
index d874302b27ad8a8b9622a43e330644e050b8bc10..668076ba235cfa9decadaa14c13743552ecfba42 100644
--- a/webkit/child/fling_animator_impl_android.cc
+++ b/webkit/child/fling_animator_impl_android.cc
@@ -98,7 +98,7 @@ float FlingAnimatorImpl::GetCurrentVelocity()
}
bool FlingAnimatorImpl::apply(double time,
- WebKit::WebGestureCurveTarget* target) {
+ blink::WebGestureCurveTarget* target) {
if (!UpdatePosition())
return false;
@@ -107,7 +107,7 @@ bool FlingAnimatorImpl::apply(double time,
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_;
@@ -127,7 +127,7 @@ bool FlingAnimatorImpl::apply(double time,
}
}
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);
@@ -138,8 +138,8 @@ bool FlingAnimatorImpl::apply(double time,
}
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;
« no previous file with comments | « webkit/child/fling_animator_impl_android.h ('k') | webkit/child/fling_curve_configuration.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698