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

Unified Diff: content/browser/renderer_host/render_widget_host_view_android.h

Issue 2835403004: Revert "Use MojoCompositorFrameSink in RendererCompositorFrameSink"
Patch Set: Rebased Created 3 years, 8 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_android.h
diff --git a/content/browser/renderer_host/render_widget_host_view_android.h b/content/browser/renderer_host/render_widget_host_view_android.h
index 8a7c1cc5754d3f1f880aadd8363a3e89155608f6..eb9ab9ef210c0fa3431f3aa64a0b1d4bf40a6edc 100644
--- a/content/browser/renderer_host/render_widget_host_view_android.h
+++ b/content/browser/renderer_host/render_widget_host_view_android.h
@@ -143,9 +143,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
BrowserAccessibilityDelegate* delegate, bool for_root_frame) override;
bool LockMouse() override;
void UnlockMouse() override;
- void DidCreateNewRendererCompositorFrameSink(
- cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink)
- override;
+ void DidCreateNewRendererCompositorFrameSink() override;
void SubmitCompositorFrame(const cc::LocalSurfaceId& local_surface_id,
cc::CompositorFrame frame) override;
void OnBeginFrameDidNotSwap(const cc::BeginFrameAck& ack) override;
@@ -419,11 +417,8 @@ class CONTENT_EXPORT RenderWidgetHostViewAndroid
float prev_top_shown_pix_;
float prev_bottom_shown_pix_;
- cc::mojom::MojoCompositorFrameSinkClient* renderer_compositor_frame_sink_ =
- nullptr;
base::ObserverList<DestructionObserver> destruction_observers_;
-
base::WeakPtrFactory<RenderWidgetHostViewAndroid> weak_ptr_factory_;
DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostViewAndroid);

Powered by Google App Engine
This is Rietveld 408576698