Implement touch events for site-isolation.

content/browser/renderer_host/render_widget_host_input_event_router.cc

 // Copyright 2015 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_input_event_router.h"
 
 #include "cc/quads/surface_draw_quad.h"
 #include "cc/surfaces/surface_id_allocator.h"
 #include "cc/surfaces/surface_manager.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/frame_messages.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
+namespace {
+
+void TransformEventTouchPositions(blink::WebTouchEvent* event,
+                                  const gfx::Vector2d& delta) {
+  for (unsigned i = 0; i < event->touchesLength; ++i) {
+     event->touches[i].position.x += delta.x();
+     event->touches[i].position.y += delta.y();
+  }
+}
+
+}  // anonymous namespace
+
 namespace content {
 
 void RenderWidgetHostInputEventRouter::OnRenderWidgetHostViewBaseDestroyed(
     RenderWidgetHostViewBase* view) {
   view->RemoveObserver(this);
 
   // Remove this view from the owner_map.
   for (auto entry : owner_map_) {
     if (entry.second == view) {
       owner_map_.erase(entry.first);
@@ skipping 118 matching lines @@
         // Since this is the first touch, it defines the target for the rest
         // of this sequence.
         DCHECK(!current_touch_target_);
         gfx::Point transformed_point;
         gfx::Point original_point(event->touches[0].position.x,
                                   event->touches[0].position.y);
         current_touch_target_ =
             FindEventTarget(root_view, original_point, &transformed_point);
         if (!current_touch_target_)
           return;
+
+        // TODO(wjmaclean): Instead of just computing a delta, we should extract
+        // the complete transform. We assume it doesn't change for the duration
+        // of the touch sequence, though this could be wrong; a better approach
+        // might be to always transform each point to the current_touch_target_
+        // for the duration of the sequence.
+        touch_delta_ = transformed_point - original_point;
       }
       ++active_touches_;
-      if (current_touch_target_)
+      if (current_touch_target_) {
+        TransformEventTouchPositions(event, touch_delta_);
         current_touch_target_->ProcessTouchEvent(*event, latency);
+      }
       break;
     }
     case blink::WebInputEvent::TouchMove:
-      if (current_touch_target_)
+      if (current_touch_target_) {
+        TransformEventTouchPositions(event, touch_delta_);
         current_touch_target_->ProcessTouchEvent(*event, latency);
+      }
       break;
     case blink::WebInputEvent::TouchEnd:
     case blink::WebInputEvent::TouchCancel:
       if (!current_touch_target_)
         break;
 
       DCHECK(active_touches_);
+      TransformEventTouchPositions(event, touch_delta_);
       current_touch_target_->ProcessTouchEvent(*event, latency);
       --active_touches_;
-      if (!active_touches_)
+      if (!active_touches_) {
         current_touch_target_ = nullptr;
+        touch_delta_ = gfx::Vector2d();
+      }
       break;
     default:
       NOTREACHED();
   }
 }
 
 void RenderWidgetHostInputEventRouter::AddSurfaceIdNamespaceOwner(
     uint32_t id,
     RenderWidgetHostViewBase* owner) {
   DCHECK(owner_map_.find(id) == owner_map_.end());
@@ skipping 24 matching lines @@
   if (owner_map_.find(cc::SurfaceIdAllocator::NamespaceForId(
           params.surface_id)) == owner_map_.end()) {
     return;
   }
   HittestData data;
   data.ignored_for_hittest = params.ignored_for_hittest;
   hittest_data_[params.surface_id] = data;
 }
 
 }  // namespace content