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
   needs_push_properties_ = true;

[powei, 2013/12/02 22:26:47]

@danakj. so I probably cannot remove this, but should I at least remove the
comment?

[danakj, 2013/12/02 22:41:30]

We should work on removing this, the TODO should remain as long as the bug is
open. If your change does not allow us to remove this, can you update the
comment to say why?

[piman, 2013/12/03 01:46:41]

I don't see a reason why a needs_push_properties is needed any more, with the
DFResourceCollection logic, I think it should go?
If there is a reason, make sure to update the TODO too, because
DidCommitFrameData doesn't exist any more.

[powei, 2013/12/03 02:11:11]

crbug.com/259090 has been merged into crbug.com/263069, which is marked as
fixed.  However, when I tried to remove needs_push_properties_, the following
cc_unittests fail.  The last test crashes out on a failed dcheck.  Maybe these
tests are assuming needs_push_properties_ is set true?

LayerTreeHostDelegatedTestCreateChildId
LayerTreeHostDelegatedTestLayerUsesFrameDamage
LayerTreeHostDelegatedTestReturnUnusedResources
LayerTreeHostDelegatedTestReusedResources
LayerTreeHostDelegatedTestFrameBeforeAck
LayerTreeHostDelegatedTestFrameBeforeTakeResources
LayerTreeHostDelegatedTestBadFrame
LayerTreeHostDelegatedTestDontLeakResource
LayerTreeHostDelegatedTestCommitWithoutTake
DelegatedFrameIsActivatedDuringCommit
LayerTreeHostDelegatedTestTwoImplLayers
LayerTreeHostDelegatedTestRemoveAndAddToTree

 }
 
 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 35 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