Use callback instead of weak pointer in OutputSurfaceWithoutParent.

content/browser/renderer_host/compositor_impl_android.cc

 // Copyright (c) 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 "content/browser/renderer_host/compositor_impl_android.h"
 
 #include <android/bitmap.h>
 #include <android/native_window_jni.h>
 
 #include "base/android/jni_android.h"
@@ skipping 56 matching lines @@
 
 namespace {
 
 const unsigned int kMaxSwapBuffers = 2U;
 
 // Used to override capabilities_.adjust_deadline_for_parent to false
 class OutputSurfaceWithoutParent : public cc::OutputSurface {
  public:
   OutputSurfaceWithoutParent(
       const scoped_refptr<ContextProviderCommandBuffer>& context_provider,
-      base::WeakPtr<CompositorImpl> compositor_impl)
+      const base::Callback<void(gpu::Capabilities)>&
+          populate_gpu_capabilities_callback)
       : cc::OutputSurface(context_provider),
+        populate_gpu_capabilities_callback_(populate_gpu_capabilities_callback),
         swap_buffers_completion_callback_(
             base::Bind(&OutputSurfaceWithoutParent::OnSwapBuffersCompleted,
                        base::Unretained(this))) {
     capabilities_.adjust_deadline_for_parent = false;
     capabilities_.max_frames_pending = 2;
-    compositor_impl_ = compositor_impl;
   }
 
   void SwapBuffers(cc::CompositorFrame* frame) override {
     GetCommandBufferProxy()->SetLatencyInfo(frame->metadata.latency_info);
     DCHECK(frame->gl_frame_data->sub_buffer_rect ==
            gfx::Rect(frame->gl_frame_data->size));
     context_provider_->ContextSupport()->Swap();
     client_->DidSwapBuffers();
   }
 
   bool BindToClient(cc::OutputSurfaceClient* client) override {
     if (!OutputSurface::BindToClient(client))
       return false;
 
     GetCommandBufferProxy()->SetSwapBuffersCompletionCallback(
         swap_buffers_completion_callback_.callback());
 
-    compositor_impl_->PopulateGpuCapabilities(
+    populate_gpu_capabilities_callback_.Run(
         context_provider_->ContextCapabilities().gpu);
 
     return true;
   }
 
  private:
   CommandBufferProxyImpl* GetCommandBufferProxy() {
     ContextProviderCommandBuffer* provider_command_buffer =
         static_cast<content::ContextProviderCommandBuffer*>(
             context_provider_.get());
     CommandBufferProxyImpl* command_buffer_proxy =
         provider_command_buffer->GetCommandBufferProxy();
     DCHECK(command_buffer_proxy);
     return command_buffer_proxy;
   }
 
   void OnSwapBuffersCompleted(const std::vector<ui::LatencyInfo>& latency_info,
                               gfx::SwapResult result) {
     RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
     OutputSurface::OnSwapBuffersComplete();
   }
 
+  base::Callback<void(gpu::Capabilities)> populate_gpu_capabilities_callback_;
   base::CancelableCallback<void(const std::vector<ui::LatencyInfo>&,
                                 gfx::SwapResult)>
       swap_buffers_completion_callback_;
-
-  base::WeakPtr<CompositorImpl> compositor_impl_;
 };
 
 static bool g_initialized = false;
 
 bool g_use_surface_manager = false;
 base::LazyInstance<cc::SurfaceManager> g_surface_manager =
     LAZY_INSTANCE_INITIALIZER;
 
 
 int g_surface_id_namespace = 0;
@@ skipping 496 matching lines @@
   // But from here on just try and always lead to either
   // DidInitializeOutputSurface() or DidFailToInitializeOutputSurface().
   scoped_refptr<GpuChannelHost> gpu_channel_host(factory->GetGpuChannel());
   scoped_refptr<ContextProviderCommandBuffer> context_provider(
       ContextProviderCommandBuffer::Create(
           CreateGpuProcessViewContext(gpu_channel_host, attrs, surface_id_),
           BROWSER_COMPOSITOR_ONSCREEN_CONTEXT));
   DCHECK(context_provider.get());
 
   scoped_ptr<cc::OutputSurface> real_output_surface(
-      new OutputSurfaceWithoutParent(context_provider,
-                                     weak_factory_.GetWeakPtr()));
+      new OutputSurfaceWithoutParent(
+          context_provider, base::Bind(&CompositorImpl::PopulateGpuCapabilities,
+                                       weak_factory_.GetWeakPtr())));

[no sievers, 2015/06/09 22:48:30]

The OutputSurface should not be able to outlive the CompositorImpl, since the
CompositorImpl owns the LayerTreeHost.

But maybe leave it for now, since we are not able to get rid of the
weak_factory_ anyways (it's used in one other place).

[sunnyps, 2015/06/09 23:39:35]

Done.

 
   cc::SurfaceManager* manager = GetSurfaceManager();
   if (manager) {
     display_client_.reset(new cc::OnscreenDisplayClient(
         real_output_surface.Pass(), manager, HostSharedBitmapManager::current(),
         BrowserGpuMemoryBufferManager::current(),
         host_->settings().renderer_settings,
         base::ThreadTaskRunnerHandle::Get()));
     scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface(
         new cc::SurfaceDisplayOutputSurface(
@@ skipping 98 matching lines @@
 
 void CompositorImpl::SetNeedsAnimate() {
   needs_animate_ = true;
   if (!host_)
     return;
 
   host_->SetNeedsAnimate();
 }
 
 }  // namespace content