Simplify HTMLPlugInElement::PluginWrapper to not use SharedPersistent.

third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

 /**
  * Copyright (C) 1999 Lars Knoll (knoll@kde.org)
  *           (C) 1999 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Stefan Schimanski (1Stein@gmx.de)
  * Copyright (C) 2004, 2005, 2006 Apple Computer, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 30 matching lines @@
 #include "core/inspector/ConsoleMessage.h"
 #include "core/layout/LayoutImage.h"
 #include "core/layout/LayoutPart.h"
 #include "core/layout/api/LayoutEmbeddedItem.h"
 #include "core/loader/MixedContentChecker.h"
 #include "core/page/Page.h"
 #include "core/page/scrolling/ScrollingCoordinator.h"
 #include "core/plugins/PluginView.h"
 #include "platform/FrameViewBase.h"
 #include "platform/Histogram.h"
+#include "platform/bindings/V8PerIsolateData.h"
 #include "platform/loader/fetch/ResourceRequest.h"
 #include "platform/network/mime/MIMETypeFromURL.h"
 #include "platform/network/mime/MIMETypeRegistry.h"
 #include "platform/plugins/PluginData.h"
 #include "public/platform/WebURLRequest.h"
 
 namespace blink {
 
 using namespace HTMLNames;
 
@@ skipping 18 matching lines @@
       is_delaying_load_event_(false),
       // m_needsPluginUpdate(!createdByParser) allows HTMLObjectElement to delay
       // FrameViewBase updates until after all children are parsed. For
       // HTMLEmbedElement this delay is unnecessary, but it is simpler to make
       // both classes share the same codepath in this class.
       needs_plugin_update_(!created_by_parser),
       should_prefer_plug_ins_for_images_(prefer_plug_ins_for_images_option ==
                                          kShouldPreferPlugInsForImages) {}
 
 HTMLPlugInElement::~HTMLPlugInElement() {
-  DCHECK(!plugin_wrapper_);  // cleared in detachLayoutTree()
+  DCHECK(plugin_wrapper_.IsEmpty());  // cleared in detachLayoutTree()
   DCHECK(!is_delaying_load_event_);
 }
 
 DEFINE_TRACE(HTMLPlugInElement) {
   visitor->Trace(image_loader_);
   visitor->Trace(plugin_);
   visitor->Trace(persisted_plugin_);
   HTMLFrameOwnerElement::Trace(visitor);
 }
 
@@ skipping 258 matching lines @@
   HTMLFrameOwnerElement::FinishParsingChildren();
   if (UseFallbackContent())
     return;
 
   SetNeedsPluginUpdate(true);
   if (isConnected())
     LazyReattachIfNeeded();
 }
 
 void HTMLPlugInElement::ResetInstance() {
-  plugin_wrapper_.Clear();
+  plugin_wrapper_.Reset();
 }
 
-SharedPersistent<v8::Object>* HTMLPlugInElement::PluginWrapper() {
+v8::Local<v8::Object> HTMLPlugInElement::PluginWrapper() {
   LocalFrame* frame = GetDocument().GetFrame();
   if (!frame)
-    return nullptr;
+    return v8::Local<v8::Object>();
 
   // If the host dynamically turns off JavaScript (or Java) we will still
   // return the cached allocated Bindings::Instance. Not supporting this
   // edge-case is OK.
-  if (!plugin_wrapper_) {
+  v8::Isolate* isolate = V8PerIsolateData::MainThreadIsolate();
+  if (plugin_wrapper_.IsEmpty()) {
     PluginView* plugin;
 
     if (persisted_plugin_)
       plugin = persisted_plugin_.Get();
     else
       plugin = PluginWidget();
 
-    if (plugin) {
-      plugin_wrapper_ =
-          frame->GetScriptController().CreatePluginWrapper(*plugin);
-    }
+    if (plugin)
+      plugin_wrapper_.Reset(isolate, plugin->ScriptableObject(isolate));
   }
-  return plugin_wrapper_.Get();
+  return plugin_wrapper_.Get(isolate);
 }
 
 PluginView* HTMLPlugInElement::PluginWidget() const {
   if (LayoutPart* layout_part = LayoutPartForJSBindings())
     return layout_part->Plugin();
   return nullptr;
 }
 
 PluginView* HTMLPlugInElement::Plugin() const {
   return plugin_.Get();
@@ skipping 304 matching lines @@
 
 void HTMLPlugInElement::LazyReattachIfNeeded() {
   if (!UseFallbackContent() && NeedsPluginUpdate() && GetLayoutObject() &&
       !IsImageType()) {
     LazyReattachIfAttached();
     SetPersistedPlugin(nullptr);
   }
 }
 
 }  // namespace blink