Merge 174073

cc/layer.cc

Index: cc/layer.cc
===================================================================
--- cc/layer.cc	(revision 174074)
+++ cc/layer.cc	(working copy)
@@ -30,6 +30,7 @@
     : m_needsDisplay(false)
     , m_stackingOrderChanged(false)
     , m_layerId(s_nextLayerId++)
+    , m_ignoreSetNeedsCommit(false)
     , m_parent(0)
     , m_layerTreeHost(0)
     , m_layerAnimationController(LayerAnimationController::create(this))
@@ -99,6 +100,8 @@
 
 void Layer::setNeedsCommit()
 {
+    if (m_ignoreSetNeedsCommit)
+        return;
     if (m_layerTreeHost)
         m_layerTreeHost->setNeedsCommit();
 }
@@ -654,7 +657,8 @@
         return;
     m_rasterScale = scale;
 
-    if (!m_automaticallyComputeRasterScale)
+    // When automatically computed, this acts like a draw property.
+    if (m_automaticallyComputeRasterScale)
         return;
     setNeedsDisplay();
 }