| Index: cc/trees/layer_tree_host.h
|
| diff --git a/cc/trees/layer_tree_host.h b/cc/trees/layer_tree_host.h
|
| index bd2298cc0a2c1328b26b447b0af2fb374256755e..425bd50099e21c06374c9db328c4942f791d30b4 100644
|
| --- a/cc/trees/layer_tree_host.h
|
| +++ b/cc/trees/layer_tree_host.h
|
| @@ -245,6 +245,8 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
|
| // Obtains a thorough dump of the LayerTreeHost as a value.
|
| scoped_ptr<base::Value> AsValue() const;
|
|
|
| + bool in_paint_layer_contents() const { return in_paint_layer_contents_; }
|
| +
|
| protected:
|
| LayerTreeHost(LayerTreeHostClient* client, const LayerTreeSettings& settings);
|
| bool Initialize(scoped_ptr<Thread> impl_thread);
|
| @@ -313,7 +315,8 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
|
| RateLimiterMap rate_limiters_;
|
|
|
| float page_scale_factor_;
|
| - float min_page_scale_factor_, max_page_scale_factor_;
|
| + float min_page_scale_factor_;
|
| + float max_page_scale_factor_;
|
| gfx::Transform impl_transform_;
|
| bool trigger_idle_updates_;
|
|
|
| @@ -333,6 +336,8 @@ class CC_EXPORT LayerTreeHost : NON_EXPORTED_BASE(public RateLimiterClient) {
|
| };
|
| scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
|
|
|
| + bool in_paint_layer_contents_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
|
| };
|
|
|
|
|