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

Unified Diff: content/browser/web_contents/web_contents_view_android.h

Issue 2487713002: Resolves layering violation in SynchronousCompositorHost creation (Closed)
Patch Set: Created 4 years, 1 month 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/web_contents/web_contents_view_android.h
diff --git a/content/browser/web_contents/web_contents_view_android.h b/content/browser/web_contents/web_contents_view_android.h
index bd2c52dce6596a14c1baf07826b257f9b5192d0b..79a796de4df3b754a134c3608be00724a902b6c3 100644
--- a/content/browser/web_contents/web_contents_view_android.h
+++ b/content/browser/web_contents/web_contents_view_android.h
@@ -18,6 +18,8 @@
namespace content {
class ContentViewCoreImpl;
+class RenderWidgetHostViewAndroid;
+class SynchronousCompositorClient;
class WebContentsImpl;
// Android-specific implementation of the WebContentsView.
@@ -33,6 +35,13 @@ class WebContentsViewAndroid : public WebContentsView,
// by the UI frontend.
void SetContentViewCore(ContentViewCoreImpl* content_view_core);
+ void set_synchronous_compositor_client(SynchronousCompositorClient* client) {
+ synchronous_compositor_client_ = client;
+ }
+ SynchronousCompositorClient* synchronous_compositor_client() const {
+ return synchronous_compositor_client_;
+ }
+
// WebContentsView implementation --------------------------------------------
gfx::NativeView GetNativeView() const override;
gfx::NativeView GetContentNativeView() const override;
@@ -91,6 +100,8 @@ class WebContentsViewAndroid : public WebContentsView,
void OnDragEnded();
private:
+ void SetSynchronousCompositorClientFor(RenderWidgetHostViewAndroid* rwhv);
+
// The WebContents whose contents we display.
WebContentsImpl* web_contents_;
@@ -103,6 +114,9 @@ class WebContentsViewAndroid : public WebContentsView,
// The native view associated with the contents of the web.
ui::ViewAndroid view_;
+ // Interface used to get notified of events from the synchronous compositor.
+ SynchronousCompositorClient* synchronous_compositor_client_;
+
DISALLOW_COPY_AND_ASSIGN(WebContentsViewAndroid);
};

Powered by Google App Engine
This is Rietveld 408576698