Merge 174073

cc/layer.cc

 // Copyright 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/layer.h"
 
 #include "cc/active_animation.h"
 #include "cc/animation_events.h"
 #include "cc/layer_animation_controller.h"
 #include "cc/layer_impl.h"
@@ skipping 12 matching lines @@
 
 scoped_refptr<Layer> Layer::create()
 {
     return make_scoped_refptr(new Layer());
 }
 
 Layer::Layer()
     : m_needsDisplay(false)
     , m_stackingOrderChanged(false)
     , m_layerId(s_nextLayerId++)
+    , m_ignoreSetNeedsCommit(false)
     , m_parent(0)
     , m_layerTreeHost(0)
     , m_layerAnimationController(LayerAnimationController::create(this))
     , m_scrollable(false)
     , m_shouldScrollOnMainThread(false)
     , m_haveWheelEventHandlers(false)
     , m_nonFastScrollableRegionChanged(false)
     , m_touchEventHandlerRegionChanged(false)
     , m_anchorPoint(0.5, 0.5)
     , m_backgroundColor(0)
@@ skipping 49 matching lines @@
     if (m_replicaLayer)
         m_replicaLayer->setLayerTreeHost(host);
 
     // If this layer already has active animations, the host needs to be notified.
     if (host && m_layerAnimationController->hasActiveAnimation())
         host->didAddAnimation();
 }
 
 void Layer::setNeedsCommit()
 {
+    if (m_ignoreSetNeedsCommit)
+        return;
     if (m_layerTreeHost)
         m_layerTreeHost->setNeedsCommit();
 }
 
 void Layer::setNeedsFullTreeSync()
 {
     if (m_layerTreeHost)
         m_layerTreeHost->setNeedsFullTreeSync();
 }
 
@@ skipping 535 matching lines @@
     m_debugName = debugName;
     setNeedsCommit();
 }
 
 void Layer::setRasterScale(float scale)
 {
     if (m_rasterScale == scale)
         return;
     m_rasterScale = scale;
 
-    if (!m_automaticallyComputeRasterScale)
+    // When automatically computed, this acts like a draw property.
+    if (m_automaticallyComputeRasterScale)
         return;
     setNeedsDisplay();
 }
 
 void Layer::setAutomaticallyComputeRasterScale(bool automatic)
 {
     if (m_automaticallyComputeRasterScale == automatic)
         return;
     m_automaticallyComputeRasterScale = automatic;
 
@@ skipping 173 matching lines @@
 {
     return 0;
 }
 
 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped_refptr<Layer> >::iterator, void*)
 {
     // Currently we don't use z-order to decide what to paint, so there's no need to actually sort Layers.
 }
 
 }  // namespace cc