| Index: cc/trees/thread_proxy.h
|
| diff --git a/cc/trees/thread_proxy.h b/cc/trees/thread_proxy.h
|
| index 48aa661d76d9209be733f4321dc4b9a0b4178e0b..e8a791b927ef49fa43f239738ba5cb4867838558 100644
|
| --- a/cc/trees/thread_proxy.h
|
| +++ b/cc/trees/thread_proxy.h
|
| @@ -88,8 +88,6 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| explicit MainThreadOrBlockedMainThread(LayerTreeHost* host);
|
| ~MainThreadOrBlockedMainThread();
|
|
|
| - PrioritizedResourceManager* contents_texture_manager();
|
| -
|
| LayerTreeHost* layer_tree_host;
|
| bool commit_waits_for_activation;
|
| bool main_thread_inside_commit;
|
| @@ -105,10 +103,6 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
|
|
| const int layer_tree_host_id;
|
|
|
| - // Copy of the main thread side contents texture manager for work
|
| - // that needs to be done on the compositor thread.
|
| - PrioritizedResourceManager* contents_texture_manager;
|
| -
|
| scoped_ptr<Scheduler> scheduler;
|
|
|
| // Set when the main thread is waiting on a
|
| @@ -207,8 +201,6 @@ class CC_EXPORT ThreadProxy : public Proxy,
|
| void SetVideoNeedsBeginFrames(bool needs_begin_frames) override;
|
| void PostAnimationEventsToMainThreadOnImplThread(
|
| scoped_ptr<AnimationEventsVector> queue) override;
|
| - bool ReduceContentsTextureMemoryOnImplThread(size_t limit_bytes,
|
| - int priority_cutoff) override;
|
| bool IsInsideDraw() override;
|
| void RenewTreePriority() override;
|
| void PostDelayedAnimationTaskOnImplThread(const base::Closure& task,
|
|
|