Make it possible to have <object>'s scriptableObject as a v8 object instead of NPObject.

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.
  *     * Redistributions in binary form must reproduce the above
  * copyright notice, this list of conditions and the following disclaimer
  * in the documentation and/or other materials provided with the
@@ skipping 12 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * 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 "config.h"
 #include "web/WebPluginContainerImpl.h"
 
 #include "bindings/core/v8/ScriptController.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/GestureEvent.h"
 #include "core/events/KeyboardEvent.h"
 #include "core/events/MouseEvent.h"
 #include "core/events/TouchEvent.h"
 #include "core/events/WheelEvent.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
@@ skipping 36 matching lines @@
 #include "public/web/WebElement.h"
 #include "public/web/WebInputEvent.h"
 #include "public/web/WebPlugin.h"
 #include "public/web/WebPrintParams.h"
 #include "public/web/WebViewClient.h"
 #include "web/ChromeClientImpl.h"
 #include "web/ScrollbarGroup.h"
 #include "web/WebDataSourceImpl.h"
 #include "web/WebInputEventConversion.h"
 #include "web/WebViewImpl.h"
+#include "wtf/Assertions.h"
 
 
 using namespace blink;
 
 namespace blink {
 
 // Public methods --------------------------------------------------------------
 
 void WebPluginContainerImpl::setFrameRect(const IntRect& frameRect)
 {
@@ skipping 333 matching lines @@
         return;
 
     frame()->script().cleanupScriptObjectsForPlugin(this);
 }
 
 NPObject* WebPluginContainerImpl::scriptableObjectForElement()
 {
     return m_element->getNPObject();
 }
 
+v8::Local<v8::Object> WebPluginContainerImpl::getV8ObjectForElement()
+{
+    LocalFrame* frame = m_element->document().frame();
+    if (!frame)
+        return v8::Local<v8::Object>();
+
+    if (!frame->script().canExecuteScripts(NotAboutToExecuteScript))
+        return v8::Local<v8::Object>();
+
+    v8::Isolate* isolate = frame->script().isolate();
+    v8::EscapableHandleScope handleScope(isolate);

[abarth-chromium, 2014/07/29 17:34:22]

Why do we need a handle scope here?  The caller must already have one if we're
returning a v8::Local

[Krzysztof Olczyk, 2014/07/30 08:40:31]

Done.

+    v8::Handle<v8::Context> v8Context = toV8Context(frame, DOMWrapperWorld::mainWorld());
+    if (v8Context.IsEmpty())
+        return v8::Local<v8::Object>();
+    v8::Context::Scope scope(v8Context);
+
+    v8::Handle<v8::Value> v8value = toV8(m_element, v8::Handle<v8::Object>(), isolate);

[abarth-chromium, 2014/07/29 17:34:22]

We deleted all callers of toV8 with empty handles in the second parameter.  We
shouldn't add any new ones.  Can we pass the right object?

[Krzysztof Olczyk, 2014/07/30 08:40:31]

Done.

+    if (!v8value->IsObject())
+        return v8::Local<v8::Object>();

[abarth-chromium, 2014/07/29 17:34:22]

How could the v8value fail to be an object?  Should this be an ASSERT?

[Krzysztof Olczyk, 2014/07/30 08:40:31]

Done.

+    v8::Local<v8::Object> v8object(v8::Handle<v8::Object>::Cast(v8value));
+    return handleScope.Escape(v8object);
+}
+
 WebString WebPluginContainerImpl::executeScriptURL(const WebURL& url, bool popupsAllowed)
 {
     LocalFrame* frame = m_element->document().frame();
     if (!frame)
         return WebString();
 
     const KURL& kurl = url;
     ASSERT(kurl.protocolIs("javascript"));
 
     String script = decodeURLEscapeSequences(
@@ skipping 121 matching lines @@
 void WebPluginContainerImpl::didFailLoading(const ResourceError& error)
 {
     m_webPlugin->didFailLoading(error);
 }
 
 WebLayer* WebPluginContainerImpl::platformLayer() const
 {
     return m_webLayer;
 }
 
-NPObject* WebPluginContainerImpl::scriptableObject()
+void WebPluginContainerImpl::getScriptableObject(v8::Isolate* isolate, v8::Local<v8::Object>* object)
 {
-    return m_webPlugin->scriptableObject();
+    if (m_webPlugin->getScriptableObject(isolate, object)) {
+        // blink::WebPlugin implementation can't provide the obsolete NPObject at the same time:
+        ASSERT(!m_webPlugin->scriptableObject());
+        return;
+    }
+
+    NPObject* npObject = m_webPlugin->scriptableObject();
+    if (npObject)
+        *object = blink::createV8ObjectForNPObject(npObject, 0, isolate);
 }
 
 bool WebPluginContainerImpl::getFormValue(String& value)
 {
     WebString webValue;
     if (m_webPlugin->getFormValue(webValue)) {
         value = webValue;
         return true;
     }
     return false;
@@ skipping 343 matching lines @@
 
     return clipRect;
 }
 
 bool WebPluginContainerImpl::pluginShouldPersist() const
 {
     return m_webPlugin->shouldPersist();
 }
 
 } // namespace blink