Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(632)

Unified Diff: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc

Issue 510793003: Remove ui::TouchEvent -> blink::WebTouchEvent conversion methods. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make method const. Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
index 13d986b9f51b8d5c67793e1097d8c600c33354ca..f66f5117830803bfe981bb53d564f200d16d8408 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
+++ b/content/browser/renderer_host/render_widget_host_view_aura_unittest.cc
@@ -19,6 +19,7 @@
#include "content/browser/compositor/resize_lock.h"
#include "content/browser/compositor/test/no_transport_image_transport_factory.h"
#include "content/browser/frame_host/render_widget_host_view_guest.h"
+#include "content/browser/renderer_host/input/web_input_event_util.h"
#include "content/browser/renderer_host/overscroll_controller.h"
#include "content/browser/renderer_host/overscroll_controller_delegate.h"
#include "content/browser/renderer_host/render_widget_host_delegate.h"
@@ -268,9 +269,16 @@ class FakeRenderWidgetHostViewAura : public RenderWidgetHostViewAura {
: ResizeLock(new_size, defer_compositor_lock) {}
};
+ void OnTouchEvent(ui::TouchEvent* event) override {
+ RenderWidgetHostViewAura::OnTouchEvent(event);
+ touch_event_ = CreateWebTouchEventFromMotionEvent(
+ pointer_state(), event->may_cause_scrolling());
+ }
+
bool has_resize_lock_;
gfx::Size last_frame_size_;
scoped_ptr<cc::CopyOutputRequest> last_copy_request_;
+ blink::WebTouchEvent touch_event_;
};
// A layout manager that always resizes a child to the root window size.

Powered by Google App Engine
This is Rietveld 408576698