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

Unified Diff: content/browser/android/in_process/synchronous_compositor_impl.h

Issue 15920002: Fix WebView compositor input handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Avoid DCHECKs when retrieving process ID Created 7 years, 6 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/android/in_process/synchronous_compositor_impl.h
diff --git a/content/browser/android/in_process/synchronous_compositor_impl.h b/content/browser/android/in_process/synchronous_compositor_impl.h
index 3659ca01d28148cbd7a0e190beac55ab88441362..c6aced8e34e7533594e556e3686f197196280a76 100644
--- a/content/browser/android/in_process/synchronous_compositor_impl.h
+++ b/content/browser/android/in_process/synchronous_compositor_impl.h
@@ -9,9 +9,14 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "content/browser/android/in_process/synchronous_compositor_output_surface.h"
+#include "content/port/common/input_event_ack_state.h"
#include "content/public/browser/android/synchronous_compositor.h"
#include "content/public/browser/web_contents_user_data.h"
+namespace WebKit {
+class WebInputEvent;
+}
+
namespace content {
// The purpose of this class is to act as the intermediary between the various
@@ -24,8 +29,14 @@ class SynchronousCompositorImpl
public SynchronousCompositorOutputSurfaceDelegate,
public WebContentsUserData<SynchronousCompositorImpl> {
public:
+ // When used from browser code, use both |process_id| and |routing_id|.
+ static SynchronousCompositorImpl* FromID(int process_id, int routing_id);
+ // When handling upcalls from renderer code, use this version; the process id
+ // is implicitly that of the in-process renderer.
static SynchronousCompositorImpl* FromRoutingID(int routing_id);
+ InputEventAckState HandleInputEvent(const WebKit::WebInputEvent& input_event);
+
// SynchronousCompositor
virtual bool IsHwReady() OVERRIDE;
virtual void SetClient(SynchronousCompositorClient* compositor_client)
« no previous file with comments | « content/browser/android/in_process/DEPS ('k') | content/browser/android/in_process/synchronous_compositor_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698