Fix lifecycle-vs-threads of GpuVDAContext3D.

content/renderer/render_thread_impl.h

 // 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.
 
 #ifndef CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 #define CONTENT_RENDERER_RENDER_THREAD_IMPL_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "base/timer.h"
 #include "build/build_config.h"
 #include "content/common/child_process.h"
 #include "content/common/child_thread.h"
 #include "content/common/content_export.h"
 #include "content/common/css_colors.h"
 #include "content/common/gpu/client/gpu_channel_host.h"
 #include "content/common/gpu/gpu_process_launch_causes.h"
 #include "content/public/renderer/render_thread.h"
 #include "ipc/ipc_channel_proxy.h"
+#include "third_party/WebKit/Source/Platform/chromium/public/WebGraphicsContext3D.h"
 #include "ui/gfx/native_widget_types.h"
 
 class AppCacheDispatcher;
 class AudioInputMessageFilter;
 class AudioMessageFilter;
 class CompositorThread;
 class DBMessageFilter;
 class DevToolsAgentFilter;
 class DomStorageDispatcher;
 class GpuChannelHost;
@@ skipping 177 matching lines @@
   scoped_refptr<base::MessageLoopProxy> GetFileThreadMessageLoopProxy();
 
   // Causes the idle handler to skip sending idle notifications
   // on the two next scheduled calls, so idle notifications are
   // not sent for at least one notification delay.
   void PostponeIdleNotification();
 
   // Returns a graphics context shared among all
   // RendererGpuVideoDecoderFactories, or NULL on error.  Context remains owned
   // by this class and must be null-tested before each use to detect context
-  // loss.  The returned WeakPtr<> is only valid on the compositor thread when
+  // loss.  The returned context is only valid on the compositor thread when
   // threaded compositing is enabled.
-  base::WeakPtr<WebGraphicsContext3DCommandBufferImpl> GetGpuVDAContext3D();
+  WebGraphicsContext3DCommandBufferImpl* GetGpuVDAContext3D();
+
+  // Handle loss of the shared GpuVDAContext3D context above.
+  static void OnGpuVDAContextLoss();
 
   // AudioRendererMixerManager instance which manages renderer side mixer
   // instances shared based on configured audio parameters.  Lazily created on
   // first call.
   content::AudioRendererMixerManager* GetAudioRendererMixerManager();
 
  private:
   virtual bool OnControlMessageReceived(const IPC::Message& msg) OVERRIDE;
 
   void Init();
@@ skipping 58 matching lines @@
 
   // A lazily initiated thread on which file operations are run.
   scoped_ptr<base::Thread> file_thread_;
 
   bool compositor_initialized_;
   scoped_ptr<CompositorThread> compositor_thread_;
   scoped_ptr<content::old::BrowserPluginRegistry> browser_plugin_registry_;
 
   ObserverList<content::RenderProcessObserver> observers_;
 
+  class GpuVDAContextLostCallback
+      : public WebKit::WebGraphicsContext3D::WebGraphicsContextLostCallback {

[piman, 2012/08/13 17:45:06]

Note: I'm fine with this, but FYI you can declare the inner class here and
define it in the .cc file, which does let you get rid of the header.

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

Taking advantage of the scoped_ptr for auto-dtor goodness requires a full
declaration here, not just a fwd-declaration.

[piman, 2012/08/13 18:35:57]

Nah, you only need it with the destructor of RenderThreadImpl

+   public:
+    GpuVDAContextLostCallback();
+    virtual ~GpuVDAContextLostCallback();
+    virtual void onContextLost();
+  };
+
+  scoped_ptr<GpuVDAContextLostCallback> context_lost_cb_;
   scoped_ptr<WebGraphicsContext3DCommandBufferImpl> gpu_vda_context3d_;
 
   scoped_ptr<content::AudioRendererMixerManager> audio_renderer_mixer_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderThreadImpl);
 };
 
 #endif  // CONTENT_RENDERER_RENDER_THREAD_IMPL_H_