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

Source/bindings/core/v8/NPV8Object.cpp

 /*
  * Copyright (C) 2004, 2006 Apple Computer, Inc.  All rights reserved.
  * Copyright (C) 2007, 2008, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. 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 distribution.
  *
@@ skipping 93 matching lines @@
     char buffer[32];
     snprintf(buffer, sizeof(buffer), "%d", identifier->value.number);
     return v8AtomicString(isolate, buffer);
 }
 
 NPObject* v8ObjectToNPObject(v8::Handle<v8::Object> object)
 {
     return reinterpret_cast<NPObject*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperObjectIndex));
 }
 
+bool isWrappedNPObject(v8::Handle<v8::Object> object)
+{
+    if (object->InternalFieldCount() == npObjectInternalFieldCount) {
+        const WrapperTypeInfo* typeInfo = static_cast<const WrapperTypeInfo*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex));
+        return typeInfo == npObjectTypeInfo();
+    }
+    return false;
+}
+
 NPObject* npCreateV8ScriptObject(NPP npp, v8::Handle<v8::Object> object, LocalDOMWindow* root, v8::Isolate* isolate)
 {
     // Check to see if this object is already wrapped.
-    if (object->InternalFieldCount() == npObjectInternalFieldCount) {
-        const WrapperTypeInfo* typeInfo = static_cast<const WrapperTypeInfo*>(object->GetAlignedPointerFromInternalField(v8DOMWrapperTypeIndex));
-        if (typeInfo == npObjectTypeInfo()) {
-            NPObject* returnValue = v8ObjectToNPObject(object);
-            _NPN_RetainObject(returnValue);
-            return returnValue;
-        }
+    if (isWrappedNPObject(object)) {
+        NPObject* returnValue = v8ObjectToNPObject(object);
+        _NPN_RetainObject(returnValue);
+        return returnValue;
     }
 
     V8NPObjectVector* objectVector = 0;
     if (V8PerContextData* perContextData = V8PerContextData::from(object->CreationContext())) {
         int v8ObjectHash = object->GetIdentityHash();
         ASSERT(v8ObjectHash);
         V8NPObjectMap* v8NPObjectMap = perContextData->v8NPObjectMap();
         V8NPObjectMap::iterator iter = v8NPObjectMap->find(v8ObjectHash);
         if (iter != v8NPObjectMap->end()) {
             V8NPObjectVector& objects = iter->value;
@@ skipping 463 matching lines @@
 
         convertV8ObjectToNPVariant(resultObject, npObject, result, isolate);
         return true;
     }
 
     if (NP_CLASS_STRUCT_VERSION_HAS_CTOR(npObject->_class) && npObject->_class->construct)
         return npObject->_class->construct(npObject, arguments, argumentCount, result);
 
     return false;
 }