Lost context fixes

This makes sure that after a GPU context lost event, we don't try to re-create a
context based on the lost one.

BUG=chromium-os:13537
TEST=with pepper flash, run multiple flash sites in multiple tabs, make sure they use the GPU process. kill the gpu process, and check that renderers don't crash.

Review URL: http://codereview.chromium.org/6726048

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@80042 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 41 insertions, 23 deletions

diff --git a/content/renderer/pepper_plugin_delegate_impl.cc b/content/renderer/pepper_plugin_delegate_impl.cc
index 9bf35ce..7c94c1e 100644
--- a/content/renderer/pepper_plugin_delegate_impl.cc
+++ b/content/renderer/pepper_plugin_delegate_impl.cc
@@ -500,7 +500,7 @@ webkit::ppapi::PluginDelegate::PlatformContext3D*
   WebGraphicsContext3DCommandBufferImpl* context =
       static_cast<WebGraphicsContext3DCommandBufferImpl*>(
           render_view_->webview()->graphicsContext3D());
-  if (!context)
+  if (!context || context->isContextLost())
     return NULL;
 
   ggl::Context* parent_context = context->context();
diff --git a/content/renderer/render_widget_fullscreen_pepper.cc b/content/renderer/render_widget_fullscreen_pepper.cc
index 3d85b29..8284523 100644
--- a/content/renderer/render_widget_fullscreen_pepper.cc
+++ b/content/renderer/render_widget_fullscreen_pepper.cc
@@ -4,6 +4,7 @@
 
 #include "content/renderer/render_widget_fullscreen_pepper.h"
 
+#include "base/message_loop.h"
 #include "chrome/renderer/render_thread.h"
 #include "content/renderer/ggl.h"
 #include "content/renderer/gpu_channel_host.h"
@@ -134,6 +135,16 @@ class PepperWidget : public WebWidget {
   DISALLOW_COPY_AND_ASSIGN(PepperWidget);
 };
 
+void DestroyContext(ggl::Context* context, GLuint program, GLuint buffer) {
+  DCHECK(context);
+  gpu::gles2::GLES2Implementation* gl = ggl::GetImplementation(context);
+  if (program)
+    gl->DeleteProgram(program);
+  if (buffer)
+    gl->DeleteBuffers(1, &buffer);
+  ggl::DestroyContext(context);
+}
+
 }  // anonymous namespace
 
 // static
@@ -161,7 +172,8 @@ RenderWidgetFullscreenPepper::RenderWidgetFullscreenPepper(
 }
 
 RenderWidgetFullscreenPepper::~RenderWidgetFullscreenPepper() {
-  DestroyContext();
+  if (context_)
+    DestroyContext(context_, program_, buffer_);
 }
 
 void RenderWidgetFullscreenPepper::Invalidate() {
@@ -271,29 +283,21 @@ void RenderWidgetFullscreenPepper::CreateContext() {
       "GL_OES_packed_depth_stencil GL_OES_depth24",
       attribs,
       active_url_);
-  if (!context_ || !InitContext()) {
-    DestroyContext();
+  if (!context_)
+    return;
+
+  if (!InitContext()) {
+    DestroyContext(context_, program_, buffer_);
+    context_ = NULL;
     return;
   }
+
   ggl::SetSwapBuffersCallback(
       context_,
       NewCallback(this, &RenderWidgetFullscreenPepper::DidFlushPaint));
-}
-
-void RenderWidgetFullscreenPepper::DestroyContext() {
-  if (context_) {
-    gpu::gles2::GLES2Implementation* gl = ggl::GetImplementation(context_);
-    if (program_) {
-      gl->DeleteProgram(program_);
-      program_ = 0;
-    }
-    if (buffer_) {
-      gl->DeleteBuffers(1, &buffer_);
-      buffer_ = 0;
-    }
-    ggl::DestroyContext(context_);
-    context_ = NULL;
-  }
+  ggl::SetContextLostCallback(
+      context_,
+      NewCallback(this, &RenderWidgetFullscreenPepper::OnLostContext));
 }
 
 namespace {
@@ -397,3 +401,17 @@ bool RenderWidgetFullscreenPepper::CheckCompositing() {
   }
   return compositing;
 }
+
+void RenderWidgetFullscreenPepper::OnLostContext() {
+  if (!context_)
+    return;
+  // Destroy the context later, in case we got called from InitContext for
+  // example. We still need to reset context_ now so that a new context gets
+  // created when the plugin recreates its own.
+  MessageLoop::current()->PostTask(
+      FROM_HERE,
+      NewRunnableFunction(DestroyContext, context_, program_, buffer_));
+  context_ = NULL;
+  program_ = 0;
+  buffer_ = 0;
+}
diff --git a/content/renderer/render_widget_fullscreen_pepper.h b/content/renderer/render_widget_fullscreen_pepper.h
index e0609a3..8ade7cb 100644
--- a/content/renderer/render_widget_fullscreen_pepper.h
+++ b/content/renderer/render_widget_fullscreen_pepper.h
@@ -67,9 +67,6 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
   // Creates the GL context for compositing.
   void CreateContext();
 
-  // Destroys the GL context for compositing.
-  void DestroyContext();
-
   // Initialize the GL states and resources for compositing.
   bool InitContext();
 
@@ -77,6 +74,9 @@ class RenderWidgetFullscreenPepper : public RenderWidgetFullscreen,
   // and notify the browser.
   bool CheckCompositing();
 
+  // Called when the compositing context gets lost.
+  void OnLostContext();
+
   // URL that is responsible for this widget, passed to ggl::CreateViewContext.
   GURL active_url_;