Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(73)

Unified Diff: third_party/WebKit/Source/core/html/HTMLPlugInElement.cpp

Issue 1483733002: Remove support for NPObjects. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 c856856417e4aebab1cce45e6c9c79053095bd63..5aa28dfbdf6cc8b20e9c7b800bb1612544e6bfee 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)
@@ -248,11 +241,6 @@ void HTMLPlugInElement::detach(const AttachContext& context)
resetInstance();
- if (m_NPObject) {
- _NPN_ReleaseObject(m_NPObject);
- m_NPObject = 0;
- }
-
HTMLFrameOwnerElement::detach(context);
}
@@ -410,21 +398,6 @@ bool HTMLPlugInElement::layoutObjectIsFocusable() const
return layoutObject() && layoutObject()->isEmbeddedObject() && !layoutEmbeddedItem().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())
- toPluginView(pluginWidget())->setFocus(focused, WebFocusTypeNone);
-}
-
bool HTMLPlugInElement::isImageType()
{
if (m_serviceType.isEmpty() && protocolIs(m_url, "data"))
« no previous file with comments | « third_party/WebKit/Source/core/html/HTMLPlugInElement.h ('k') | third_party/WebKit/Source/core/page/FocusController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698