| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index 2dc93ee2bffcb5a45843584253e0d5e988298253..3831cd212b14405651410d4ec586c29d2c26c01e 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -58,6 +58,7 @@ class LayerTreeHostImplClient;
|
| class LayerTreeHostSingleThreadClient;
|
| class PropertyTrees;
|
| class Region;
|
| +class RemoteProtoChannel;
|
| class RenderingStatsInstrumentation;
|
| class ResourceProvider;
|
| class ResourceUpdateQueue;
|
| @@ -94,8 +95,23 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
|
| static scoped_ptr<LayerTreeHost> CreateSingleThreaded(
|
| LayerTreeHostSingleThreadClient* single_thread_client,
|
| InitParams* params);
|
| +
|
| + static scoped_ptr<LayerTreeHost> CreateRemote(
|
| + RemoteProtoChannel* remote_proto_channel,
|
| + InitParams* params);
|
| +
|
| + static scoped_ptr<LayerTreeHost> CreateDeserializable(
|
| + scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner,
|
| + InitParams* params);
|
| +
|
| virtual ~LayerTreeHost();
|
|
|
| + // Should be called only for the remote mode.
|
| + void ToProtobuf();
|
| +
|
| + // Should be called only for the deserializable mode.
|
| + void FromProtobuf();
|
| +
|
| // LayerTreeHost interface to Proxy.
|
| void WillBeginMainFrame();
|
| void DidBeginMainFrame();
|
| @@ -373,6 +389,12 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
|
| LayerTreeHostSingleThreadClient* single_thread_client,
|
| scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
|
| scoped_ptr<BeginFrameSource> external_begin_frame_source);
|
| + void InitializeRemote(
|
| + RemoteProtoChannel* remote_proto_channel,
|
| + scoped_refptr<base::SingleThreadTaskRunner> main_task_runner);
|
| + void InitializeDeserializable(
|
| + scoped_refptr<base::SingleThreadTaskRunner> main_task_runner,
|
| + scoped_refptr<base::SingleThreadTaskRunner> impl_task_runner);
|
| void InitializeForTesting(scoped_ptr<TaskRunnerProvider> task_runner_provider,
|
| scoped_ptr<Proxy> proxy_for_testing);
|
| void SetOutputSurfaceLostForTesting(bool is_lost) {
|
| @@ -408,6 +430,8 @@ class CC_EXPORT LayerTreeHost : public MutatorHostClient {
|
|
|
| bool IsSingleThreaded() const;
|
| bool IsThreaded() const;
|
| + bool IsRemote() const;
|
| + bool IsDeserializable() const;
|
|
|
| struct UIResourceClientData {
|
| UIResourceClient* client;
|
|
|