aura: Add touch-event support for RWHVA.

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2011 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_aura.h"
 
 #include "base/logging.h"
 #include "content/browser/renderer_host/backing_store_skia.h"
 #include "content/browser/renderer_host/web_input_event_aura.h"
 #include "content/browser/renderer_host/render_widget_host.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h"
 #include "ui/aura/desktop.h"
 #include "ui/aura/event.h"
 #include "ui/aura/hit_test.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/compositor/layer.h"
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 #include "base/bind.h"
 #include "content/browser/gpu/gpu_process_host_ui_shim.h"
 #include "content/browser/renderer_host/accelerated_surface_container_linux.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "ui/gfx/gl/gl_bindings.h"
 #endif
 
+using WebKit::WebTouchEvent;
+
 namespace {
 
 #if defined(UI_COMPOSITOR_IMAGE_TRANSPORT)
 void AcknowledgeSwapBuffers(int32 route_id, int gpu_host_id) {
   // It's possible that gpu_host_id is no longer valid at this point (like if
   // gpu process was restarted after a crash).  SendToGpuHost handles this.
   GpuProcessHostUIShim::SendToGpuHost(gpu_host_id,
       new AcceleratedSurfaceMsg_BuffersSwappedACK(route_id));
 }
 #endif
 
+ui::TouchStatus DecideTouchStatus(const WebKit::WebTouchEvent& event,
+                                  WebKit::WebTouchPoint* point) {
+  if (event.type == WebKit::WebInputEvent::TouchStart &&
+      event.touchesLength == 1)
+    return ui::TOUCH_STATUS_START;
+
+  if (event.type == WebKit::WebInputEvent::TouchMove && point == NULL)
+    return ui::TOUCH_STATUS_CONTINUE;
+
+  if (event.type == WebKit::WebInputEvent::TouchEnd &&
+      event.touchesLength == 0)
+    return ui::TOUCH_STATUS_END;
+
+  if (event.type == WebKit::WebInputEvent::TouchCancel)
+    return ui::TOUCH_STATUS_CANCEL;
+
+  return point ? ui::TOUCH_STATUS_CONTINUE : ui::TOUCH_STATUS_UNKNOWN;
+}
+
+void UpdateWebTouchEventAfterDispatch(WebKit::WebTouchEvent* event,
+                                      WebKit::WebTouchPoint* point) {
+  if (point->state != WebKit::WebTouchPoint::StateReleased)

[sadrul, 2011/10/25 19:09:55]

I kept this here, and didn't move to content:: since the code should be the same
on both windows and linux.

+    return;
+  --event->touchesLength;
+  for (unsigned i = point - event->touches;
+       i < event->touchesLength;
+       ++i) {
+    event->touches[i] = event->touches[i + 1];
+  }
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, public:
 
 RenderWidgetHostViewAura::RenderWidgetHostViewAura(RenderWidgetHost* host)
     : host_(host),
       ALLOW_THIS_IN_INITIALIZER_LIST(window_(new aura::Window(this))),
       is_loading_(false) {
   host_->SetView(this);
@@ skipping 304 matching lines @@
     host_->ForwardWheelEvent(content::MakeWebMouseWheelEvent(event));
   else
     host_->ForwardMouseEvent(content::MakeWebMouseEvent(event));
 
   // Return true so that we receive released/drag events.
   return true;
 }
 
 ui::TouchStatus RenderWidgetHostViewAura::OnTouchEvent(
     aura::TouchEvent* event) {
-  NOTIMPLEMENTED();
-  return ui::TOUCH_STATUS_UNKNOWN;
+  // Update the touch event first.
+  WebKit::WebTouchPoint* point = content::UpdateWebTouchEvent(event,
+      &touch_event_);
+
+  // Forward the touch event only if a touch point was updated.
+  if (point) {
+    host_->ForwardTouchEvent(touch_event_);
+    UpdateWebTouchEventAfterDispatch(&touch_event_, point);
+  }
+
+  return DecideTouchStatus(touch_event_, point);
 }
 
 bool RenderWidgetHostViewAura::ShouldActivate(aura::Event* event) {
   return false;
 }
 
 void RenderWidgetHostViewAura::OnActivated() {
 }
 
 void RenderWidgetHostViewAura::OnLostActive() {
@@ skipping 44 matching lines @@
 
 #if !defined(TOUCH_UI)
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewAura, private:
 
 void RenderWidgetHostViewAura::UpdateCursorIfOverSelf() {
   //NOTIMPLEMENTED();
   // TODO(beng): See RenderWidgetHostViewWin.
 }
 #endif