Cleanup ChildFrameCompositingHelper on destruction.

content/renderer/child_frame_compositing_helper.cc

 // Copyright 2014 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 "content/renderer/child_frame_compositing_helper.h"
 
 #include "cc/blink/web_layer_impl.h"
 #include "cc/layers/delegated_frame_provider.h"
 #include "cc/layers/delegated_frame_resource_collection.h"
 #include "cc/layers/delegated_renderer_layer.h"
@@ skipping 43 matching lines @@
     : host_routing_id_(host_routing_id),
       last_route_id_(0),
       last_output_surface_id_(0),
       last_host_id_(0),
       ack_pending_(true),
       opaque_(true),
       browser_plugin_(browser_plugin),
       render_frame_proxy_(render_frame_proxy),
       frame_(frame) {}
 
-ChildFrameCompositingHelper::~ChildFrameCompositingHelper() {}
+ChildFrameCompositingHelper::~ChildFrameCompositingHelper() {
+  if (resource_collection_.get())
+    resource_collection_->SetClient(NULL);

[danakj, 2015/02/03 20:07:42]

Destruction implies the child compositor is shutting down? Or do we need to
lose+return all the resources in the collection first?

[lfg, 2015/02/03 20:26:22]

The child compositor is shutting down. I'm not sure if we need to return the
resources in the collection.

The issue I'm trying to fix is that since the resource collection is refcounted
and may be referenced in the cc tree, it may be left with a dangling pointer to
the ChildFrameCompositingHelper. Then, if we update the cc tree at the wrong
time we may get a crash.

[danakj, 2015/02/03 20:40:10]

Right. But if you just drop the client, you'll leak any resources being held by
this compositor instead of returning them to the child compositor ever. If it's
shutting down anyway, it'll just delete/drop its refs anyways so that's okay. If
it's not you leak them until it does shutdown.

So, it sounds like this is okay then. LGTM

+}
 
 BrowserPluginManager* ChildFrameCompositingHelper::GetBrowserPluginManager() {
   if (!browser_plugin_)
     return NULL;
 
   return BrowserPluginManager::Get();
 }
 
 blink::WebPluginContainer* ChildFrameCompositingHelper::GetContainer() {
   if (!browser_plugin_)
@@ skipping 205 matching lines @@
   SendReclaimCompositorResourcesToBrowser(params);
 }
 
 void ChildFrameCompositingHelper::SetContentsOpaque(bool opaque) {
   opaque_ = opaque;
   if (delegated_layer_.get())
     delegated_layer_->SetContentsOpaque(opaque_);
 }
 
 }  // namespace content