| Index: third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| diff --git a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| index 7589865b1261ca3714972e1f22c8ff400dc7b02b..1b19893775fb5795162a13b1ac0cb7af88a0c2f7 100644
|
| --- a/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| +++ b/third_party/WebKit/Source/web/WebPluginContainerImpl.cpp
|
| @@ -34,7 +34,6 @@
|
| #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"
|
| @@ -429,23 +428,6 @@ void WebPluginContainerImpl::reportGeometry()
|
| 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();
|
| @@ -632,16 +614,7 @@ v8::Local<v8::Object> WebPluginContainerImpl::scriptableObject(v8::Isolate* isol
|
| #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)
|
|
|