| Index: cc/trees/layer_tree_host_in_process.h
|
| diff --git a/cc/trees/layer_tree_host_in_process.h b/cc/trees/layer_tree_host_in_process.h
|
| index aeb7d4c3e1ef2626d83a9b5e28a88eda2478f407..64669d0bccc516a88908e7cfa63b6e07c3ccaded 100644
|
| --- a/cc/trees/layer_tree_host_in_process.h
|
| +++ b/cc/trees/layer_tree_host_in_process.h
|
| @@ -61,7 +61,6 @@ class LayerTreeMutator;
|
| class MutatorHost;
|
| class PropertyTrees;
|
| class Region;
|
| -class RemoteProtoChannel;
|
| class RenderingStatsInstrumentation;
|
| class ResourceProvider;
|
| class ResourceUpdateQueue;
|
| @@ -71,10 +70,6 @@ struct ReflectedMainFrameState;
|
| struct RenderingStats;
|
| struct ScrollAndScaleSet;
|
|
|
| -namespace proto {
|
| -class LayerTreeHost;
|
| -}
|
| -
|
| class CC_EXPORT LayerTreeHostInProcess : public LayerTreeHost {
|
| public:
|
| // TODO(sad): InitParams should be a movable type so that it can be
|
| @@ -99,21 +94,6 @@ class CC_EXPORT LayerTreeHostInProcess : public LayerTreeHost {
|
| LayerTreeHostSingleThreadClient* single_thread_client,
|
| InitParams* params);
|
|
|
| - static std::unique_ptr<LayerTreeHostInProcess> CreateRemoteServer(
|
| - RemoteProtoChannel* remote_proto_channel,
|
| - InitParams* params);
|
| -
|
| - // The lifetime of this LayerTreeHostInProcess is tied to the lifetime of the
|
| - // remote server LayerTreeHostInProcess. It should be created on receiving
|
| - // CompositorMessageToImpl::InitializeImpl message and destroyed on receiving
|
| - // a CompositorMessageToImpl::CloseImpl message from the server. This ensures
|
| - // that the client will not send any compositor messages once the
|
| - // LayerTreeHostInProcess on the server is destroyed.
|
| - static std::unique_ptr<LayerTreeHostInProcess> CreateRemoteClient(
|
| - RemoteProtoChannel* remote_proto_channel,
|
| - scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
|
| - InitParams* params);
|
| -
|
| ~LayerTreeHostInProcess() override;
|
|
|
| // LayerTreeHost implementation.
|
| @@ -215,24 +195,8 @@ class CC_EXPORT LayerTreeHostInProcess : public LayerTreeHost {
|
|
|
| Proxy* proxy() const { return proxy_.get(); }
|
|
|
| - // Serializes the parts of this LayerTreeHostInProcess that is needed for a
|
| - // commit to a protobuf message. Not all members are serialized as they are
|
| - // not helpful for remote usage.
|
| - // The |swap_promise_list_| is transferred to the serializer in
|
| - // |swap_promises|.
|
| - void ToProtobufForCommit(
|
| - proto::LayerTreeHost* proto,
|
| - std::vector<std::unique_ptr<SwapPromise>>* swap_promises);
|
| -
|
| - // Deserializes the protobuf into this LayerTreeHostInProcess before a commit.
|
| - // The expected input is a serialized remote LayerTreeHost. After
|
| - // deserializing the protobuf, the normal commit-flow should continue.
|
| - void FromProtobufForCommit(const proto::LayerTreeHost& proto);
|
| -
|
| bool IsSingleThreaded() const;
|
| bool IsThreaded() const;
|
| - bool IsRemoteServer() const;
|
| - bool IsRemoteClient() const;
|
|
|
| ImageSerializationProcessor* image_serialization_processor() const {
|
| return image_serialization_processor_;
|
| @@ -259,13 +223,6 @@ class CC_EXPORT LayerTreeHostInProcess : public LayerTreeHost {
|
| void InitializeSingleThreaded(
|
| LayerTreeHostSingleThreadClient* single_thread_client,
|
| scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
|
| - void InitializeRemoteServer(
|
| - RemoteProtoChannel* remote_proto_channel,
|
| - scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
|
| - void InitializeRemoteClient(
|
| - RemoteProtoChannel* remote_proto_channel,
|
| - scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
|
| - scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
|
| void InitializeForTesting(
|
| std::unique_ptr<TaskRunnerProvider> task_runner_provider,
|
| std::unique_ptr<Proxy> proxy_for_testing);
|
|
|