Track NPObject ownership by the originating plugins' NPP identifier. [4/6] (Chrome)

webkit/plugins/npapi/webplugin_impl.cc

 // 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.
 
 #include "webkit/plugins/npapi/webplugin_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/crash_logging.h"
 #include "base/logging.h"
 #include "base/memory/linked_ptr.h"
@@ skipping 242 matching lines @@
   SetContainer(container);
 
   bool ok = plugin_delegate->Initialize(
       plugin_url_, arg_names_, arg_values_, this, load_manually_);
   if (!ok) {
     LOG(ERROR) << "Couldn't initialize plug-in";
     plugin_delegate->PluginDestroyed();
 
     WebKit::WebPlugin* replacement_plugin =
         page_delegate_->CreatePluginReplacement(file_path_);
-    if (!replacement_plugin || !replacement_plugin->initialize(container))
+    if (!replacement_plugin)

[darin (slow to review), 2013/06/18 23:26:24]

It is not clear to me why you are making this change.

[Wez, 2013/06/19 05:17:54]

Reworded comment to try to make that clearer.

       return false;
 
+    // Schedule ourself for asynchronous destruction, and and swap ourself out

[darin (slow to review), 2013/06/18 23:26:24]

nit: "and and"

[Wez, 2013/06/19 05:17:54]

Done.

+    // for the replacement plugin.
+    destroy();
     container->setPlugin(replacement_plugin);
-    destroy();
-    return true;
+
+    return replacement_plugin->initialize(container);
   }
 
   delegate_ = plugin_delegate;
 
   return true;
 }
 
 void WebPluginImpl::destroy() {
   SetContainer(NULL);
   base::MessageLoop::current()->DeleteSoon(FROM_HERE, this);
@@ skipping 1034 matching lines @@
 
   // Destroy the current plugin instance.
   TearDownPluginInstance(loader);
 
   container_ = container_widget;
   webframe_ = webframe;
 
   WebPluginDelegate* plugin_delegate = page_delegate_->CreatePluginDelegate(
       file_path_, mime_type_);
 
+  // Store the plugin's unique identifier, used by the container to track its
+  // script objects, and enable script objects (since Initialize may use them
+  // even if it fails).
+  npp_ = plugin_delegate->GetPluginNPP();
+  container_->allowScriptObjects();
+
   bool ok = plugin_delegate && plugin_delegate->Initialize(
       plugin_url_, arg_names_, arg_values_, this, load_manually_);
 
   if (!ok) {
+    container_->clearScriptObjects();
     container_ = NULL;
     // TODO(iyengar) Should we delete the current plugin instance here?
     return false;
   }
 
   delegate_ = plugin_delegate;
 
   // Force a geometry update to occur to ensure that the plugin becomes
   // visible.
   container_->reportGeometry();
@@ skipping 69 matching lines @@
       webframe_->setReferrerForRequest(*request, plugin_url_);
       break;
 
     default:
       break;
   }
 }
 
 }  // namespace npapi
 }  // namespace webkit