Revert 220418 "cc: Block commit on activate by setting a flag on..."

trunk/src/cc/layers/tiled_layer.h

 // Copyright 2011 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_LAYERS_TILED_LAYER_H_
 #define CC_LAYERS_TILED_LAYER_H_
 
 #include "cc/base/cc_export.h"
 #include "cc/layers/contents_scaling_layer.h"
 #include "cc/resources/layer_tiling_data.h"
 
 namespace cc {
 class LayerUpdater;
 class PrioritizedResourceManager;
 class PrioritizedResource;
 class UpdatableTile;
 
 class CC_EXPORT TiledLayer : public ContentsScalingLayer {
  public:
   enum TilingOption {
     ALWAYS_TILE,
     NEVER_TILE,
     AUTO_TILE,
   };
 
   // Layer implementation.
   virtual void SetIsMask(bool is_mask) OVERRIDE;
   virtual void PushPropertiesTo(LayerImpl* layer) OVERRIDE;
+  virtual bool BlocksPendingCommit() const OVERRIDE;
   virtual bool DrawsContent() const OVERRIDE;
   virtual void ReduceMemoryUsage() OVERRIDE;
   virtual void SetNeedsDisplayRect(const gfx::RectF& dirty_rect) OVERRIDE;
   virtual void SetLayerTreeHost(LayerTreeHost* layer_tree_host) OVERRIDE;
   virtual void SetTexturePriorities(const PriorityCalculator& priority_calc)
       OVERRIDE;
   virtual Region VisibleContentOpaqueRegion() const OVERRIDE;
   virtual bool Update(ResourceUpdateQueue* queue,
                       const OcclusionTracker* occlusion) OVERRIDE;
 
@@ skipping 93 matching lines @@
 
   TilingOption tiling_option_;
   scoped_ptr<LayerTilingData> tiler_;
 
   DISALLOW_COPY_AND_ASSIGN(TiledLayer);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_TILED_LAYER_H_