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

trunk/src/cc/layers/delegated_renderer_layer.h

 // Copyright 2012 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_DELEGATED_RENDERER_LAYER_H_
 #define CC_LAYERS_DELEGATED_RENDERER_LAYER_H_
 
 #include "cc/base/cc_export.h"
 #include "cc/layers/layer.h"
 #include "cc/resources/returned_resource.h"
 
 namespace cc {
 
 class DelegatedFrameData;
 class DelegatedRendererLayerClient;
 
 class CC_EXPORT DelegatedRendererLayer : public Layer {
  public:
   static scoped_refptr<DelegatedRendererLayer> Create(
       DelegatedRendererLayerClient* client);
 
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
       OVERRIDE;
-  virtual void SetLayerTreeHost(LayerTreeHost* host) OVERRIDE;
   virtual void PushPropertiesTo(LayerImpl* impl) OVERRIDE;
   virtual bool DrawsContent() const OVERRIDE;
 
   // Set the size at which the frame should be displayed, with the origin at the
   // layer's origin. This must always contain at least the layer's bounds. A
   // value of (0, 0) implies that the frame should be displayed to fit exactly
   // in the layer's bounds.
   void SetDisplaySize(gfx::Size size);
 
   void SetFrameData(scoped_ptr<DelegatedFrameData> frame_data);
 
   // Passes ownership of any unused resources that had been given by the child
   // compositor to the given array, so they can be given back to the child.
   void TakeUnusedResourcesForChildCompositor(ReturnedResourceArray* array);
 
+  virtual bool BlocksPendingCommit() const OVERRIDE;
+
  protected:
   explicit DelegatedRendererLayer(DelegatedRendererLayerClient* client);
   virtual ~DelegatedRendererLayer();
 
  private:
   scoped_ptr<DelegatedFrameData> frame_data_;
   gfx::RectF damage_in_frame_;
   gfx::Size frame_size_;
   gfx::Size display_size_;
   ReturnedResourceArray unused_resources_for_child_compositor_;
 
   DelegatedRendererLayerClient* client_;
 
   DISALLOW_COPY_AND_ASSIGN(DelegatedRendererLayer);
 };
 
 }  // namespace cc
 #endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_H_