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

webkit/glue/webplugin_impl.cc

Index: webkit/glue/webplugin_impl.cc
===================================================================
--- webkit/glue/webplugin_impl.cc	(revision 23290)
+++ webkit/glue/webplugin_impl.cc	(working copy)
@@ -1070,10 +1070,11 @@
       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();
   }
 }
 
@@ -1082,10 +1083,11 @@
   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();
   }
 }
 
Property changes on: webkit\glue\webplugin_impl.cc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /trunk/src/webkit/glue/webplugin_impl.cc:r22431