Fixed some bugs that prevented the GPU plugin from shutting down without cras...

chrome/renderer/webplugin_delegate_pepper.cc

 // Copyright (c) 2009 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.
 
 #define PEPPER_APIS_ENABLED 1
 
 #include "chrome/renderer/webplugin_delegate_pepper.h"
 
 #include <string>
 #include <vector>
@@ skipping 111 matching lines @@
 
     window_.window = NULL;
     instance_->NPP_SetWindow(&window_);
 
     instance_->NPP_Destroy();
 
     instance_->set_web_plugin(NULL);
 
     instance_ = 0;
   }
+
+  // Destroy the nested GPU plugin only after first destroying the underlying
+  // Pepper plugin. This is so the Pepper plugin does not attempt to issue
+  // rendering commands after the GPU plugin has stopped processing them and
+  // responding to them.
+  if (nested_delegate_) {
+    nested_delegate_->PluginDestroyed();
+    nested_delegate_ = NULL;
+  }
 }
 
 void WebPluginDelegatePepper::UpdateGeometry(
     const gfx::Rect& window_rect,
     const gfx::Rect& clip_rect) {
   // Only resend to the instance if the geometry has changed.
   if (window_rect == window_rect_ && clip_rect == clip_rect_)
     return;
 
   clip_rect_ = clip_rect;
@@ skipping 430 matching lines @@
   // TODO(sehr): disable resetting these NPPVs by plugins.
   instance->set_windowless(true);
   instance->set_transparent(true);
 }
 
 WebPluginDelegatePepper::~WebPluginDelegatePepper() {
   DestroyInstance();
 }
 
 void WebPluginDelegatePepper::PluginDestroyed() {
-  if (nested_delegate_) {
-    nested_delegate_->PluginDestroyed();
-    nested_delegate_ = NULL;
-  }
   delete this;
 }
 
 void WebPluginDelegatePepper::Paint(WebKit::WebCanvas* canvas,
                                     const gfx::Rect& rect) {
 #if defined(OS_WIN)
   if (nested_delegate_) {
     // TODO(apatrick): The GPU plugin will render to an offscreen render target.
     //    Need to copy it to the screen here.
   } else {
@@ skipping 130 matching lines @@
       BuildCharEvent(&event, &npevent);
       break;
     case NPEventType_Minimize:
     case NPEventType_Focus:
     case NPEventType_Device:
       // NOTIMPLEMENTED();
       break;
   }
   return instance()->NPP_HandleEvent(&npevent) != 0;
 }