Fix lifecycle-vs-threads of GpuVDAContext3D.

content/renderer/render_thread_impl.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/renderer/render_thread_impl.h"
 
 #include <algorithm>
 #include <limits>
 #include <map>
 #include <vector>
@@ skipping 728 matching lines @@
 }
 
 void RenderThreadImpl::UpdateHistograms(int sequence_number) {
   child_histogram_message_filter()->SendHistograms(sequence_number);
 }
 
 void RenderThreadImpl::PostponeIdleNotification() {
   idle_notifications_to_skip_ = 2;
 }
 
-base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>
+class GpuVDAContextLostCallback
+    : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {
+ public:
+  virtual void onContextLost() {
+    ChildThread::current()->message_loop()->PostTask(FROM_HERE, base::Bind(
+        &RenderThreadImpl::OnGpuVDAContextLoss));
+  }
+};
+
+/* static */
+void RenderThreadImpl::OnGpuVDAContextLoss() {
+  RenderThreadImpl* self = RenderThreadImpl::current();
+  DCHECK(self);
+  if (!self->gpu_vda_context3d_.get())
+    return;
+  if (self->compositor_thread()) {
+    self->compositor_thread()->GetWebThread()->message_loop()->DeleteSoon(
+        FROM_HERE, self->gpu_vda_context3d_.release());
+  } else {
+    self->gpu_vda_context3d_.reset();
+  }
+}
+
+WebGraphicsContext3DCommandBufferImpl*
 RenderThreadImpl::GetGpuVDAContext3D() {
-  // If we already handed out a pointer to a context and it's been lost, create
-  // a new one.
-  if (gpu_vda_context3d_.get() && gpu_vda_context3d_->isContextLost()) {
-    if (compositor_thread()) {
-      compositor_thread()->GetWebThread()->message_loop()->DeleteSoon(
-          FROM_HERE, gpu_vda_context3d_.release());
-    } else {
-      gpu_vda_context3d_.reset();
-    }
-  }
+  static GpuVDAContextLostCallback* context_lost_cb =
+      new GpuVDAContextLostCallback();

[piman, 2012/08/13 17:23:35]

Why the need to leak it? Could it be a scoped_ptr field on RenderThreadImpl? The
compositor thread is shut down in the destructor, so it should be safe.

[Ami GONE FROM CHROMIUM, 2012/08/13 17:38:16]

Done, at the cost of having to 
#include
"third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
from render_thread_impl.h

   if (!gpu_vda_context3d_.get()) {
     gpu_vda_context3d_.reset(
         WebGraphicsContext3DCommandBufferImpl::CreateOffscreenContext(
             this, WebKit::WebGraphicsContext3D::Attributes(),
             GURL("chrome://gpu/RenderThreadImpl::GetGpuVDAContext3D")));
+    gpu_vda_context3d_->setContextLostCallback(context_lost_cb);
   }
-  if (!gpu_vda_context3d_.get())
-    return base::WeakPtr<WebGraphicsContext3DCommandBufferImpl>();
-  return gpu_vda_context3d_->AsWeakPtr();
+  return gpu_vda_context3d_.get();
 }
 
 content::AudioRendererMixerManager*
 RenderThreadImpl::GetAudioRendererMixerManager() {
   if (!audio_renderer_mixer_manager_.get()) {
     audio_renderer_mixer_manager_.reset(new AudioRendererMixerManager(
         audio_hardware::GetOutputSampleRate(),
         audio_hardware::GetOutputBufferSize()));
   }
 
@@ skipping 261 matching lines @@
 
 scoped_refptr<base::MessageLoopProxy>
 RenderThreadImpl::GetFileThreadMessageLoopProxy() {
   DCHECK(message_loop() == MessageLoop::current());
   if (!file_thread_.get()) {
     file_thread_.reset(new base::Thread("Renderer::FILE"));
     file_thread_->Start();
   }
   return file_thread_->message_loop_proxy();
 }