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

Unified Diff: content/renderer/gpu/render_widget_compositor.h

Issue 2494623002: cc: Remove client/engine LayerTreeHostInProcess. (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
« no previous file with comments | « content/public/renderer/remote_proto_channel.h ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/gpu/render_widget_compositor.h
diff --git a/content/renderer/gpu/render_widget_compositor.h b/content/renderer/gpu/render_widget_compositor.h
index e51ec83e181ac7ce62fa88e047294c57204d3543..23123b52036c3d4f84f82caeccb715098f421af9 100644
--- a/content/renderer/gpu/render_widget_compositor.h
+++ b/content/renderer/gpu/render_widget_compositor.h
@@ -17,9 +17,9 @@
#include "cc/trees/layer_tree_host_client.h"
#include "cc/trees/layer_tree_host_single_thread_client.h"
#include "cc/trees/layer_tree_settings.h"
-#include "cc/trees/remote_proto_channel.h"
#include "cc/trees/swap_promise_monitor.h"
#include "content/common/content_export.h"
+#include "content/public/renderer/remote_proto_channel.h"
#include "content/renderer/gpu/compositor_dependencies.h"
#include "third_party/WebKit/public/platform/WebLayerTreeView.h"
#include "ui/gfx/geometry/rect.h"
@@ -55,7 +55,7 @@ class CONTENT_EXPORT RenderWidgetCompositor
: NON_EXPORTED_BASE(public blink::WebLayerTreeView),
NON_EXPORTED_BASE(public cc::LayerTreeHostClient),
NON_EXPORTED_BASE(public cc::LayerTreeHostSingleThreadClient),
- NON_EXPORTED_BASE(public cc::RemoteProtoChannel) {
+ public RemoteProtoChannel {
public:
// Attempt to construct and initialize a compositor instance for the widget
// with the given settings. Returns NULL if initialization fails.
@@ -197,7 +197,7 @@ class CONTENT_EXPORT RenderWidgetCompositor
void DidSubmitCompositorFrame() override;
void DidLoseCompositorFrameSink() override;
- // cc::RemoteProtoChannel implementation.
+ // RemoteProtoChannel implementation.
void SetProtoReceiver(ProtoReceiver* receiver) override;
void SendCompositorProto(const cc::proto::CompositorMessage& proto) override;
@@ -231,7 +231,7 @@ class CONTENT_EXPORT RenderWidgetCompositor
blink::WebLayoutAndPaintAsyncCallback* layout_and_paint_async_callback_;
- cc::RemoteProtoChannel::ProtoReceiver* remote_proto_channel_receiver_;
+ RemoteProtoChannel::ProtoReceiver* remote_proto_channel_receiver_;
base::WeakPtrFactory<RenderWidgetCompositor> weak_factory_;
};
« no previous file with comments | « content/public/renderer/remote_proto_channel.h ('k') | content/renderer/gpu/render_widget_compositor.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698