| Index: cc/trees/layer_tree_host_impl.h
|
| diff --git a/cc/trees/layer_tree_host_impl.h b/cc/trees/layer_tree_host_impl.h
|
| index e0182a5b324908f3cc8e7577ee1a354ca85ff67e..a7f4a1f7405c173c3381f81bbf3be79f9fb367b0 100644
|
| --- a/cc/trees/layer_tree_host_impl.h
|
| +++ b/cc/trees/layer_tree_host_impl.h
|
| @@ -352,6 +352,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| std::unique_ptr<EvictionTilePriorityQueue> BuildEvictionQueue(
|
| TreePriority tree_priority) override;
|
| void SetIsLikelyToRequireADraw(bool is_likely_to_require_a_draw) override;
|
| + const gfx::ColorSpace& GetTileColorSpace() const override;
|
|
|
| // ScrollbarAnimationControllerClient implementation.
|
| void PostDelayedScrollbarAnimationTask(const base::Closure& task,
|
| @@ -430,7 +431,7 @@ class CC_EXPORT LayerTreeHostImpl
|
| LayerTreeImpl* recycle_tree() { return recycle_tree_.get(); }
|
| const LayerTreeImpl* recycle_tree() const { return recycle_tree_.get(); }
|
| // Returns the tree LTH synchronizes with.
|
| - LayerTreeImpl* sync_tree() {
|
| + LayerTreeImpl* sync_tree() const {
|
| // TODO(enne): This is bogus. It should return based on the value of
|
| // CommitToActiveTree() and not whether the pending tree exists.
|
| return pending_tree_ ? pending_tree_.get() : active_tree_.get();
|
|
|