Remove ui::TouchEvent -> blink::WebTouchEvent conversion methods.

content/browser/renderer_host/render_widget_host_view_aura.h

Index: content/browser/renderer_host/render_widget_host_view_aura.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index 47c15e89924af39193ebddce4c494782dcfa6c32..6b9ebc525905e322ecddbad6f5a02c4ef94e6bf7 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -31,6 +31,7 @@
 #include "ui/base/ime/text_input_client.h"
 #include "ui/base/touch/selection_bound.h"
 #include "ui/base/touch/touch_editing_controller.h"
+#include "ui/events/gestures/motion_event_aura.h"
 #include "ui/gfx/display_observer.h"
 #include "ui/gfx/insets.h"
 #include "ui/gfx/rect.h"
@@ -360,6 +361,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   aura::Window* window() { return window_; }
   SkColorType PreferredReadbackFormat() override;
   DelegatedFrameHost* GetDelegatedFrameHost() const override;
+  const ui::MotionEventAura& pointer_state() { return pointer_state_; }

[sadrul, 2014/12/11 23:23:31]

const method

[tdresser, 2015/01/05 21:51:09]

Done.

 
  private:
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
@@ -516,10 +518,9 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   // The cursor for the page. This is passed up from the renderer.
   WebCursor current_cursor_;
 
-  // The touch-event. Its touch-points are updated as necessary. A new
-  // touch-point is added from an ET_TOUCH_PRESSED event, and a touch-point is
-  // removed from the list on an ET_TOUCH_RELEASED event.
-  blink::WebTouchEvent touch_event_;
+  // Stores the current state of the active pointers targeting this
+  // object.
+  ui::MotionEventAura pointer_state_;
 
   // The current text input type.
   ui::TextInputType text_input_type_;