cc: Remove DelegatingRendererLayerClient

RenderWidgetHostViewAndroid no longer subclasses DelegatingRendererLayerClient.
As it was the only use case for DelegatingRendererLayerClient, we can now remove
this class.

BUG=273250

Review URL: https://codereview.chromium.org/93463002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238508 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 11 insertions, 52 deletions

diff --git a/cc/layers/delegated_frame_provider_unittest.cc b/cc/layers/delegated_frame_provider_unittest.cc
index 871b421..20b355c 100644
--- a/cc/layers/delegated_frame_provider_unittest.cc
+++ b/cc/layers/delegated_frame_provider_unittest.cc
@@ -150,9 +150,9 @@ TEST_F(DelegatedFrameProviderTest, RefResources) {
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
 
   gfx::RectF damage;
 
@@ -208,9 +208,9 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProvider) {
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
 
   gfx::RectF damage;
 
@@ -250,9 +250,9 @@ TEST_F(DelegatedFrameProviderTest, RefResourcesInFrameProviderUntilDestroy) {
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
 
   gfx::RectF damage;
 
@@ -294,9 +294,9 @@ TEST_F(DelegatedFrameProviderTest, Damage) {
   SetFrameProvider(frame.Pass());
 
   scoped_refptr<DelegatedRendererLayer> observer1 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
   scoped_refptr<DelegatedRendererLayer> observer2 =
-      DelegatedRendererLayer::Create(NULL, frame_provider_);
+      DelegatedRendererLayer::Create(frame_provider_);
 
   gfx::RectF damage;
 
diff --git a/cc/layers/delegated_renderer_layer.cc b/cc/layers/delegated_renderer_layer.cc
index a940903..b836432 100644
--- a/cc/layers/delegated_renderer_layer.cc
+++ b/cc/layers/delegated_renderer_layer.cc
@@ -4,7 +4,6 @@
 
 #include "cc/layers/delegated_renderer_layer.h"
 
-#include "cc/layers/delegated_renderer_layer_client.h"
 #include "cc/layers/delegated_renderer_layer_impl.h"
 #include "cc/output/delegated_frame_data.h"
 #include "cc/quads/render_pass_draw_quad.h"
@@ -14,17 +13,14 @@
 namespace cc {
 
 scoped_refptr<DelegatedRendererLayer> DelegatedRendererLayer::Create(
-    DelegatedRendererLayerClient* client,
     const scoped_refptr<DelegatedFrameProvider>& frame_provider) {
   return scoped_refptr<DelegatedRendererLayer>(
-      new DelegatedRendererLayer(client, frame_provider));
+      new DelegatedRendererLayer(frame_provider));
 }
 
 DelegatedRendererLayer::DelegatedRendererLayer(
-    DelegatedRendererLayerClient* client,
     const scoped_refptr<DelegatedFrameProvider>& frame_provider)
     : Layer(),
-      client_(client),
       frame_provider_(frame_provider),
       should_collect_new_frame_(true),
       frame_data_(NULL),
@@ -81,14 +77,8 @@ void DelegatedRendererLayer::PushPropertiesTo(LayerImpl* impl) {
   frame_data_ = NULL;
   frame_damage_ = gfx::RectF();
 
-  // The ResourceProvider will have the new frame as soon as we push it to the
-  // pending tree. So resources no longer in use will be returned as well.
-  if (client_)
-    client_->DidCommitFrameData();
-
-  // TODO(danakj): The DidCommitFrameData() notification requires a push
-  // properties to happen in order to notify about resources returned
-  // from the parent compositor that are no longer in use. crbug.com/259090
+  // TODO(danakj): The following line needs to be removed. Currently, removal
+  // breaks unit tests.  crbug.com/259090
   needs_push_properties_ = true;
 }
 
diff --git a/cc/layers/delegated_renderer_layer.h b/cc/layers/delegated_renderer_layer.h
index 6cae121..dc9dfee 100644
--- a/cc/layers/delegated_renderer_layer.h
+++ b/cc/layers/delegated_renderer_layer.h
@@ -16,12 +16,10 @@
 
 namespace cc {
 class BlockingTaskRunner;
-class DelegatedRendererLayerClient;
 
 class CC_EXPORT DelegatedRendererLayer : public Layer {
  public:
   static scoped_refptr<DelegatedRendererLayer> Create(
-      DelegatedRendererLayerClient* client,
       const scoped_refptr<DelegatedFrameProvider>& frame_provider);
 
   virtual scoped_ptr<LayerImpl> CreateLayerImpl(LayerTreeImpl* tree_impl)
@@ -43,12 +41,10 @@ class CC_EXPORT DelegatedRendererLayer : public Layer {
 
  protected:
   DelegatedRendererLayer(
-      DelegatedRendererLayerClient* client,
       const scoped_refptr<DelegatedFrameProvider>& frame_provider);
   virtual ~DelegatedRendererLayer();
 
  private:
-  DelegatedRendererLayerClient* client_;
   scoped_refptr<DelegatedFrameProvider> frame_provider_;
 
   bool should_collect_new_frame_;
diff --git a/cc/layers/delegated_renderer_layer_client.h b/cc/layers/delegated_renderer_layer_client.h
deleted file mode 100644
index 3fae579..0000000
--- a/cc/layers/delegated_renderer_layer_client.h
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright 2013 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_CLIENT_H_
-#define CC_LAYERS_DELEGATED_RENDERER_LAYER_CLIENT_H_
-
-#include "cc/base/cc_export.h"
-
-namespace cc {
-
-class CC_EXPORT DelegatedRendererLayerClient {
- public:
-  // Called after the object passed in SetFrameData was handed over
-  // to the DelegatedRendererLayerImpl.
-  virtual void DidCommitFrameData() = 0;
-
-  // Called to inform the owner of the layer that unused resources can be
-  // grabbed off the DelegatedRendererLayer.
-  virtual void UnusedResourcesAreAvailable() = 0;
-
- protected:
-  virtual ~DelegatedRendererLayerClient() {}
-};
-
-}  // namespace cc
-#endif  // CC_LAYERS_DELEGATED_RENDERER_LAYER_CLIENT_H_