Index: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp |
diff --git a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp |
index dde905f7bd2dc62f75d4c59c8734df950326cded..08f4f0c16e5bc374a492b40edad36c0886b3f950 100644 |
--- a/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp |
+++ b/third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp |
@@ -23,7 +23,6 @@ |
#include "core/html/HTMLPlugInElement.h" |
#include "bindings/core/v8/ScriptController.h" |
-#include "bindings/core/v8/npruntime_impl.h" |
#include "core/CSSPropertyNames.h" |
#include "core/HTMLNames.h" |
#include "core/dom/Document.h" |
@@ -61,7 +60,6 @@ using namespace HTMLNames; |
HTMLPlugInElement::HTMLPlugInElement(const QualifiedName& tagName, Document& doc, bool createdByParser, PreferPlugInsForImagesOption preferPlugInsForImagesOption) |
: HTMLFrameOwnerElement(tagName, doc) |
, m_isDelayingLoadEvent(false) |
- , m_NPObject(0) |
// m_needsWidgetUpdate(!createdByParser) allows HTMLObjectElement to delay |
// widget updates until after all children are parsed. For HTMLEmbedElement |
// this delay is unnecessary, but it is simpler to make both classes share |
@@ -75,11 +73,6 @@ HTMLPlugInElement::~HTMLPlugInElement() |
{ |
ASSERT(!m_pluginWrapper); // cleared in detach() |
ASSERT(!m_isDelayingLoadEvent); |
- |
- if (m_NPObject) { |
- _NPN_ReleaseObject(m_NPObject); |
- m_NPObject = 0; |
- } |
} |
DEFINE_TRACE(HTMLPlugInElement) |
@@ -244,11 +237,6 @@ void HTMLPlugInElement::detach(const AttachContext& context) |
resetInstance(); |
- if (m_NPObject) { |
- _NPN_ReleaseObject(m_NPObject); |
- m_NPObject = 0; |
- } |
- |
HTMLFrameOwnerElement::detach(context); |
} |
@@ -406,18 +394,10 @@ bool HTMLPlugInElement::layoutObjectIsFocusable() const |
return !toLayoutEmbeddedObject(layoutObject())->showsUnavailablePluginIndicator(); |
} |
-NPObject* HTMLPlugInElement::getNPObject() |
-{ |
- ASSERT(document().frame()); |
- if (!m_NPObject) |
- m_NPObject = document().frame()->script().createScriptObjectForPluginElement(this); |
- return m_NPObject; |
-} |
- |
void HTMLPlugInElement::setPluginFocus(bool focused) |
{ |
// NPAPI flash requires to receive messages when web contents focus changes. |
- if (getNPObject() && pluginWidget() && pluginWidget()->isPluginView()) |
+ if (pluginWidget() && pluginWidget()->isPluginView()) |
toPluginView(pluginWidget())->setFocus(focused, WebFocusTypeNone); |
} |