Remove support for NPObjects.

third_party/WebKit/Source/web/WebPluginContainerImpl.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  * Copyright (C) 2014 Opera Software ASA. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 16 matching lines @@
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "web/WebPluginContainerImpl.h"
 
 #include "bindings/core/v8/ScriptController.h"
 #include "bindings/core/v8/ScriptSourceCode.h"
 #include "bindings/core/v8/V8Element.h"
-#include "bindings/core/v8/V8NPObject.h"
 #include "core/HTMLNames.h"
 #include "core/clipboard/DataObject.h"
 #include "core/clipboard/DataTransfer.h"
 #include "core/events/DragEvent.h"
 #include "core/events/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/ProgressEvent.h"
 #include "core/events/ResourceProgressEvent.h"
 #include "core/events/TouchEvent.h"
@@ skipping 374 matching lines @@
     // We cannot compute geometry without a parent or layoutObject.
     if (!parent() || !m_element || !m_element->layoutObject())
         return;
 
     IntRect windowRect, clipRect, unobscuredRect;
     Vector<IntRect> cutOutRects;
     calculateGeometry(windowRect, clipRect, unobscuredRect, cutOutRects);
     m_webPlugin->updateGeometry(windowRect, clipRect, unobscuredRect, cutOutRects, isVisible());
 }
 
-void WebPluginContainerImpl::allowScriptObjects()
-{
-}
-
-void WebPluginContainerImpl::clearScriptObjects()
-{
-    if (!frame())
-        return;
-
-    frame()->script().cleanupScriptObjectsForPlugin(this);
-}
-
-NPObject* WebPluginContainerImpl::scriptableObjectForElement()
-{
-    return m_element->getNPObject();
-}
-
 v8::Local<v8::Object> WebPluginContainerImpl::v8ObjectForElement()
 {
     LocalFrame* frame = m_element->document().frame();
     if (!frame)
         return v8::Local<v8::Object>();
 
     if (!frame->script().canExecuteScripts(NotAboutToExecuteScript))
         return v8::Local<v8::Object>();
 
     ScriptState* scriptState = ScriptState::forMainWorld(frame);
@@ skipping 166 matching lines @@
 
     // If the plugin has been destroyed and the reference on the stack is the
     // only one left, then don't return the scriptable object.
 #if ENABLE(OILPAN)
     if (!m_webPlugin)
 #else
     if (hasOneRef())
 #endif
         return v8::Local<v8::Object>();
 
-    if (!object.IsEmpty()) {
-        // WebPlugin implementation can't provide the obsolete NPObject at the same time:
-        ASSERT(!m_webPlugin->scriptableObject());
-        return object;
-    }
-
-    NPObject* npObject = m_webPlugin->scriptableObject();
-    if (npObject)
-        return createV8ObjectForNPObject(isolate, npObject, 0);
-    return v8::Local<v8::Object>();
+    return object;
 }
 
 bool WebPluginContainerImpl::getFormValue(String& value)
 {
     WebString webValue;
     if (m_webPlugin->getFormValue(webValue)) {
         value = webValue;
         return true;
     }
     return false;
@@ skipping 304 matching lines @@
         // frame view.
         computeClipRectsForPlugin(m_element, windowRect, clipRect, unobscuredRect);
     }
     getPluginOcclusions(m_element, this->parent(), frameRect(), cutOutRects);
     // Convert to the plugin position.
     for (size_t i = 0; i < cutOutRects.size(); i++)
         cutOutRects[i].move(-frameRect().x(), -frameRect().y());
 }
 
 } // namespace blinkf