| 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 761e5a2eeacb690a8097b990c7b028bb64ff4b7c..cd3623b8b80fdffa348e47e27c20dde6b0034ab1 100644
|
| --- a/content/renderer/gpu/render_widget_compositor.h
|
| +++ b/content/renderer/gpu/render_widget_compositor.h
|
| @@ -19,7 +19,6 @@
|
| #include "cc/trees/layer_tree_settings.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"
|
| @@ -34,9 +33,6 @@ class AnimationHost;
|
| class InputHandler;
|
| class Layer;
|
| class LayerTreeHost;
|
| -namespace proto {
|
| -class CompositorMessage;
|
| -}
|
| }
|
|
|
| namespace gfx {
|
| @@ -55,8 +51,7 @@ struct ScreenInfo;
|
| class CONTENT_EXPORT RenderWidgetCompositor
|
| : NON_EXPORTED_BASE(public blink::WebLayerTreeView),
|
| NON_EXPORTED_BASE(public cc::LayerTreeHostClient),
|
| - NON_EXPORTED_BASE(public cc::LayerTreeHostSingleThreadClient),
|
| - public RemoteProtoChannel {
|
| + NON_EXPORTED_BASE(public cc::LayerTreeHostSingleThreadClient) {
|
| public:
|
| // Attempt to construct and initialize a compositor instance for the widget
|
| // with the given settings. Returns NULL if initialization fails.
|
| @@ -106,7 +101,6 @@ class CONTENT_EXPORT RenderWidgetCompositor
|
| const base::Callback<void(std::unique_ptr<base::Value>)>& callback);
|
| bool SendMessageToMicroBenchmark(int id, std::unique_ptr<base::Value> value);
|
| void SetFrameSinkId(const cc::FrameSinkId& frame_sink_id);
|
| - void OnHandleCompositorProto(const std::vector<uint8_t>& proto);
|
| void SetPaintedDeviceScaleFactor(float device_scale);
|
| void SetDeviceColorSpace(const gfx::ColorSpace& color_space);
|
|
|
| @@ -197,10 +191,6 @@ class CONTENT_EXPORT RenderWidgetCompositor
|
| void DidSubmitCompositorFrame() override;
|
| void DidLoseCompositorFrameSink() override;
|
|
|
| - // RemoteProtoChannel implementation.
|
| - void SetProtoReceiver(ProtoReceiver* receiver) override;
|
| - void SendCompositorProto(const cc::proto::CompositorMessage& proto) override;
|
| -
|
| enum {
|
| COMPOSITOR_FRAME_SINK_RETRIES_BEFORE_FALLBACK = 4,
|
| MAX_COMPOSITOR_FRAME_SINK_RETRIES = 5,
|
| @@ -231,8 +221,6 @@ class CONTENT_EXPORT RenderWidgetCompositor
|
|
|
| blink::WebLayoutAndPaintAsyncCallback* layout_and_paint_async_callback_;
|
|
|
| - RemoteProtoChannel::ProtoReceiver* remote_proto_channel_receiver_;
|
| -
|
| cc::FrameSinkId frame_sink_id_;
|
|
|
| base::WeakPtrFactory<RenderWidgetCompositor> weak_factory_;
|
|
|