Upstream hooks for javascript touch handlers on Android.

content/browser/renderer_host/render_widget_host_view_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 "content/browser/renderer_host/render_widget_host_view_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
@@ skipping 365 matching lines @@
 }
 
 void RenderWidgetHostViewAndroid::UnhandledWheelEvent(
     const WebKit::WebMouseWheelEvent& event) {
   // intentionally empty, like RenderWidgetHostViewViews
 }
 
 void RenderWidgetHostViewAndroid::ProcessAckedTouchEvent(
     const WebKit::WebTouchEvent& touch_event,
     bool processed) {
-  // intentionally empty, like RenderWidgetHostViewViews
+  if (content_view_core_)
+    content_view_core_->ConfirmTouchEvent(processed);
 }
 
 void RenderWidgetHostViewAndroid::SetHasHorizontalScrollbar(
     bool has_horizontal_scrollbar) {
   // intentionally empty, like RenderWidgetHostViewViews
 }
 
 void RenderWidgetHostViewAndroid::SetScrollOffsetPinning(
     bool is_pinned_to_left, bool is_pinned_to_right) {
   // intentionally empty, like RenderWidgetHostViewViews
@@ skipping 79 matching lines @@
 void RenderWidgetHostViewAndroid::SetContentViewCore(
     ContentViewCoreImpl* content_view_core) {
   content_view_core_ = content_view_core;
   if (host_) {
     GpuSurfaceTracker::Get()->SetSurfaceHandle(
         host_->surface_id(), content_view_core_ ?
             GetCompositingSurface() : gfx::GLSurfaceHandle());
   }
 }
 
-void RenderWidgetHostViewAndroid::DidSetNeedTouchEvents(
+void RenderWidgetHostViewAndroid::HasTouchEventHandlers(
     bool need_touch_events) {
   if (content_view_core_)
-    content_view_core_->DidSetNeedTouchEvents(need_touch_events);
+    content_view_core_->HasTouchEventHandlers(need_touch_events);
 }
 
 // static
 void RenderWidgetHostViewPort::GetDefaultScreenInfo(
     WebKit::WebScreenInfo* results) {
   DeviceInfo info;
   const int width = info.GetWidth();
   const int height = info.GetHeight();
   results->horizontalDPI = 160 * info.GetDPIScale();
   results->verticalDPI = 160 * info.GetDPIScale();
   results->depth = info.GetBitsPerPixel();
   results->depthPerComponent = info.GetBitsPerComponent();
   results->isMonochrome = (results->depthPerComponent == 0);
   results->rect = WebKit::WebRect(0, 0, width, height);
   // TODO(husky): Remove any system controls from availableRect.
   results->availableRect = WebKit::WebRect(0, 0, width, height);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content