| Index: content/renderer/gpu/input_handler_wrapper.cc
|
| diff --git a/content/renderer/gpu/input_handler_wrapper.cc b/content/renderer/gpu/input_handler_wrapper.cc
|
| index 348ff6dc5864b1d29b46ae42ded42f2eaa6d2bfe..d1747f2433da777f84c2e27625585e940486df5d 100644
|
| --- a/content/renderer/gpu/input_handler_wrapper.cc
|
| +++ b/content/renderer/gpu/input_handler_wrapper.cc
|
| @@ -30,7 +30,7 @@ InputHandlerWrapper::~InputHandlerWrapper() {
|
| }
|
|
|
| void InputHandlerWrapper::TransferActiveWheelFlingAnimation(
|
| - const WebKit::WebActiveWheelFlingParameters& params) {
|
| + const blink::WebActiveWheelFlingParameters& params) {
|
| main_loop_->PostTask(
|
| FROM_HERE,
|
| base::Bind(&RenderViewImpl::TransferActiveWheelFlingAnimation,
|
| @@ -42,11 +42,11 @@ void InputHandlerWrapper::WillShutdown() {
|
| input_handler_manager_->RemoveInputHandler(routing_id_);
|
| }
|
|
|
| -WebKit::WebGestureCurve* InputHandlerWrapper::CreateFlingAnimationCurve(
|
| +blink::WebGestureCurve* InputHandlerWrapper::CreateFlingAnimationCurve(
|
| int deviceSource,
|
| - const WebKit::WebFloatPoint& velocity,
|
| - const WebKit::WebSize& cumulative_scroll) {
|
| - return WebKit::Platform::current()->createFlingAnimationCurve(
|
| + const blink::WebFloatPoint& velocity,
|
| + const blink::WebSize& cumulative_scroll) {
|
| + return blink::Platform::current()->createFlingAnimationCurve(
|
| deviceSource, velocity, cumulative_scroll);
|
| }
|
|
|
|
|