Merge 22431 - This fixes the npapiresponseheaders layout test, which started ...

webkit/glue/webplugin_impl.cc

 // Copyright (c) 2006-2008 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 "config.h"
 
 #include "Document.h"
 #include "DocumentLoader.h"
 #include "Event.h"
 #include "EventNames.h"
@@ skipping 1052 matching lines @@
     MultiPartResponseHandlerMap::iterator index =
       multi_part_response_map_.find(client_info->client);
     if (index != multi_part_response_map_.end()) {
       delete (*index).second;
       multi_part_response_map_.erase(index);
 
       WebView* web_view = webframe_->GetView();
       web_view->GetDelegate()->DidStopLoading(web_view);
     }
     loader->setDefersLoading(true);
-    client_info->client->DidFinishLoading();
-    // The WebPluginResourceClient pointer gets deleted soon after a call to
-    // DidFinishLoading.
+    WebPluginResourceClient* resource_client = client_info->client;
+    // The ClientInfo can get deleted in the call to DidFinishLoading below.
+    // It is not safe to access this structure after that.
     client_info->client = NULL;
+    resource_client->DidFinishLoading();
   }
 }
 
 void WebPluginImpl::didFail(WebURLLoader* loader,
                             const WebURLError&) {
   ClientInfo* client_info = GetClientInfoFromLoader(loader);
   if (client_info && client_info->client) {
     loader->setDefersLoading(true);
-    client_info->client->DidFail();
-    // The WebPluginResourceClient pointer gets deleted soon after a call to
-    // DidFinishLoading.
+    WebPluginResourceClient* resource_client = client_info->client;
+    // The ClientInfo can get deleted in the call to DidFail below.
+    // It is not safe to access this structure after that.
     client_info->client = NULL;
+    resource_client->DidFail();
   }
 }
 
 void WebPluginImpl::RemoveClient(size_t i) {
   clients_.erase(clients_.begin() + i);
 }
 
 void WebPluginImpl::RemoveClient(WebURLLoader* loader) {
   for (size_t i = 0; i < clients_.size(); ++i) {
     if (clients_[i].loader.get() == loader) {
@@ skipping 360 matching lines @@
 
   WebPluginGeometry move;
   move.window = window_;
   move.window_rect = gfx::Rect();
   move.clip_rect = gfx::Rect();
   move.rects_valid = false;
   move.visible = widget_->isVisible();
 
   webview->delegate()->DidMovePlugin(move);
 }