Fix pinch gestures with nonscrollable root layer.

content/renderer/gpu/input_handler_proxy.cc

 // Copyright (c) 2013 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 "content/renderer/gpu/input_handler_proxy.h"
 
 #include "base/debug/trace_event.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "content/renderer/gpu/input_handler_proxy_client.h"
@@ skipping 155 matching lines @@
     bool did_scroll = input_handler_->ScrollBy(
         gfx::Point(gesture_event.x, gesture_event.y),
         gfx::Vector2dF(-gesture_event.data.scrollUpdate.deltaX,
                        -gesture_event.data.scrollUpdate.deltaY));
     return did_scroll ? DID_HANDLE : DROP_EVENT;
   } else if (event.type == WebInputEvent::GestureScrollEnd) {
 #ifndef NDEBUG
     DCHECK(expect_scroll_update_end_);
     expect_scroll_update_end_ = false;
 #endif
+    input_handler_->ScrollEnd();
+
     if (!gesture_scroll_on_impl_thread_)
       return DID_NOT_HANDLE;
 
-    input_handler_->ScrollEnd();
     gesture_scroll_on_impl_thread_ = false;
     return DID_HANDLE;
   } else if (event.type == WebInputEvent::GesturePinchBegin) {
 #ifndef NDEBUG
     DCHECK(!expect_pinch_update_end_);
     expect_pinch_update_end_ = true;
 #endif
     input_handler_->PinchGestureBegin();
     gesture_pinch_on_impl_thread_ = true;
     return DID_HANDLE;
@@ skipping 256 matching lines @@
   TRACE_EVENT2("renderer",
                "InputHandlerProxy::notifyCurrentFlingVelocity",
                "vx",
                velocity.width,
                "vy",
                velocity.height);
   input_handler_->NotifyCurrentFlingVelocity(ToClientScrollIncrement(velocity));
 }
 
 }  // namespace content