Merge 194269

cc/trees/layer_tree_host.h

Index: cc/trees/layer_tree_host.h
===================================================================
--- cc/trees/layer_tree_host.h	(revision 194303)
+++ cc/trees/layer_tree_host.h	(working copy)
@@ -245,6 +245,8 @@
   // 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 @@
   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 @@
   };
   scoped_ptr<PendingPageScaleAnimation> pending_page_scale_animation_;
 
+  bool in_paint_layer_contents_;
+
   DISALLOW_COPY_AND_ASSIGN(LayerTreeHost);
 };