Merge 174073

cc/layer.h

 // 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.
 
 #ifndef CC_LAYER_H_
 #define CC_LAYER_H_
 
 #include <public/WebFilterOperations.h>
 #include <string>
 #include <vector>
@@ skipping 303 matching lines @@
     // is not available and the update rect will remain empty.
     // Note this rect is in layer space (not content space).
     gfx::RectF m_updateRect;
 
     scoped_refptr<Layer> m_maskLayer;
 
     // Constructs a LayerImpl of the correct runtime type for this Layer type.
     virtual scoped_ptr<LayerImpl> createLayerImpl(LayerTreeImpl* treeImpl);
     int m_layerId;
 
+    // When true, the layer is about to perform an update. Any commit requests
+    // will be handled implcitly after the update completes.
+    bool m_ignoreSetNeedsCommit;
+
 private:
     friend class base::RefCounted<Layer>;
 
     void setParent(Layer*);
     bool hasAncestor(Layer*) const;
     bool descendantIsFixedToContainerLayer() const;
 
     size_t numChildren() const { return m_children.size(); }
 
     // Returns the index of the child or -1 if not found.
@@ skipping 62 matching lines @@
     WebKit::WebLayerScrollClient* m_layerScrollClient;
 
     DrawProperties<Layer, RenderSurface> m_drawProperties;
 };
 
 void sortLayers(std::vector<scoped_refptr<Layer> >::iterator, std::vector<scoped_refptr<Layer> >::iterator, void*);
 
 }  // namespace cc
 
 #endif  // CC_LAYER_H_