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

Unified Diff: content/renderer/mus/compositor_mus_connection.h

Issue 2270953002: Merge the mojo blink type converter into ui/events/blink (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase apparently restored deleted files Created 4 years, 3 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
« no previous file with comments | « content/renderer/mus/BUILD.gn ('k') | content/renderer/mus/compositor_mus_connection.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/mus/compositor_mus_connection.h
diff --git a/content/renderer/mus/compositor_mus_connection.h b/content/renderer/mus/compositor_mus_connection.h
index b344e2aac6b5ca33c4c36111d925fe40036bbae3..2d477448898d42e0d46ea5486fab50fbe9d7f856 100644
--- a/content/renderer/mus/compositor_mus_connection.h
+++ b/content/renderer/mus/compositor_mus_connection.h
@@ -14,6 +14,7 @@
#include "services/ui/public/cpp/window_tree_client.h"
#include "services/ui/public/cpp/window_tree_client_delegate.h"
#include "third_party/WebKit/public/web/WebInputEvent.h"
+#include "ui/events/gestures/motion_event_aura.h"
namespace ui {
struct DidOverscrollParams;
@@ -69,6 +70,8 @@ class CONTENT_EXPORT CompositorMusConnection
const base::Callback<void(ui::mojom::EventResult)>& ack,
ui::mojom::EventResult result);
+ std::unique_ptr<blink::WebInputEvent> Convert(const ui::Event& event);
+
// WindowTreeClientDelegate implementation:
void OnDidDestroyClient(ui::WindowTreeClient* client) override;
void OnEmbed(ui::Window* root) override;
@@ -89,6 +92,9 @@ class CONTENT_EXPORT CompositorMusConnection
InputHandlerManager* const input_handler_manager_;
std::unique_ptr<ui::WindowSurfaceBinding> window_surface_binding_;
+ // Stores the current state of the active pointers targeting this object.
+ ui::MotionEventAura pointer_state_;
+
DISALLOW_COPY_AND_ASSIGN(CompositorMusConnection);
};
« no previous file with comments | « content/renderer/mus/BUILD.gn ('k') | content/renderer/mus/compositor_mus_connection.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698