cc: Remove DelegatingRendererLayerClient

cc/layers/delegated_renderer_layer.cc

 // 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.
 
 #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"
 #include "cc/trees/blocking_task_runner.h"
 #include "cc/trees/layer_tree_host.h"
 
 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),
       main_thread_runner_(BlockingTaskRunner::current()),
       weak_ptrs_(this) {
   frame_provider_->AddObserver(this);
 }
 
 DelegatedRendererLayer::~DelegatedRendererLayer() {
   frame_provider_->RemoveObserver(this);
@@ skipping 36 matching lines @@
   delegated_impl->SetDisplaySize(display_size_);
 
   delegated_impl->CreateChildIdIfNeeded(
       frame_provider_->GetReturnResourcesCallbackForImplThread());
 
   if (frame_data_)
     delegated_impl->SetFrameData(frame_data_, frame_damage_);
   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.

[danakj, 2013/12/03 18:28:27]

Can you keep crbug.com/323049 in the comment?

[powei, 2013/12/03 18:38:53]

Done.  But do you really want crbug.com/323049 and not the original
crbug.com/259090?

   needs_push_properties_ = true;
 }
 
 void DelegatedRendererLayer::ProviderHasNewFrame() {
   should_collect_new_frame_ = true;
   SetNeedsUpdate();
   // The active frame needs to be replaced and resources returned before the
   // commit is called complete.
   SetNextCommitWaitsForActivation();
 }
@@ skipping 36 matching lines @@
 
   // If any quad has a filter operation or a blend mode other than normal,
   // then we need an offscreen context to draw this layer's content.
   if (FrameDataRequiresFilterContext(frame_data_))
     layer_tree_host()->set_needs_filter_context();
 
   return true;
 }
 
 }  // namespace cc