V8 Binding: Introduce toNativeWithTypeCheck

Source/bindings/v8/V8NPObject.cpp

 /*
 * Copyright (C) 2006, 2007, 2008, 2009 Google Inc. 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
@@ skipping 51 matching lines @@
         int m_number;
     } m_value;
     bool m_isString;
 };
 
 // FIXME: need comments.
 // Params: holder could be HTMLEmbedElement or NPObject
 static void npObjectInvokeImpl(const v8::FunctionCallbackInfo<v8::Value>& info, InvokeFunctionType functionId)
 {
     NPObject* npObject;
+    v8::Isolate* isolate = info.GetIsolate();
 
     // These three types are subtypes of HTMLPlugInElement.
-    if (V8HTMLAppletElement::hasInstance(info.Holder(), info.GetIsolate()) || V8HTMLEmbedElement::hasInstance(info.Holder(), info.GetIsolate())
-        || V8HTMLObjectElement::hasInstance(info.Holder(), info.GetIsolate())) {
-        // The holder object is a subtype of HTMLPlugInElement.
-        HTMLPlugInElement* element;
-        if (V8HTMLAppletElement::hasInstance(info.Holder(), info.GetIsolate()))
-            element = V8HTMLAppletElement::toNative(info.Holder());
-        else if (V8HTMLEmbedElement::hasInstance(info.Holder(), info.GetIsolate()))
-            element = V8HTMLEmbedElement::toNative(info.Holder());
-        else
-            element = V8HTMLObjectElement::toNative(info.Holder());
+    HTMLPlugInElement* element = V8HTMLAppletElement::toNativeWithTypeCheck(isolate, info.Holder());
+    if (!element) {
+        element = V8HTMLEmbedElement::toNativeWithTypeCheck(isolate, info.Holder());
+        if (!element) {
+            element = V8HTMLObjectElement::toNativeWithTypeCheck(isolate, info.Holder());
+        }
+    }
+    if (element) {
         if (RefPtr<SharedPersistent<v8::Object> > wrapper = element->pluginWrapper()) {
-            v8::Isolate* isolate = v8::Isolate::GetCurrent();
             v8::HandleScope handleScope(isolate);
             npObject = v8ObjectToNPObject(wrapper->newLocal(isolate));
         } else
             npObject = 0;
     } else {
         // The holder object is not a subtype of HTMLPlugInElement, it must be an NPObject which has three
         // internal fields.
         if (info.Holder()->InternalFieldCount() != npObjectInternalFieldCount) {
             throwError(v8ReferenceError, "NPMethod called on non-NPObject", info.GetIsolate());
             return;
         }
 
         npObject = v8ObjectToNPObject(info.Holder());
     }
 
     // Verify that our wrapper wasn't using a NPObject which has already been deleted.
     if (!npObject || !_NPN_IsAlive(npObject)) {
-        throwError(v8ReferenceError, "NPObject deleted", info.GetIsolate());
+        throwError(v8ReferenceError, "NPObject deleted", isolate);
         return;
     }
 
     // Wrap up parameters.
     int numArgs = info.Length();
     OwnPtr<NPVariant[]> npArgs = adoptArrayPtr(new NPVariant[numArgs]);
 
     for (int i = 0; i < numArgs; i++)
-        convertV8ObjectToNPVariant(info[i], npObject, &npArgs[i], info.GetIsolate());
+        convertV8ObjectToNPVariant(info[i], npObject, &npArgs[i], isolate);
 
     NPVariant result;
     VOID_TO_NPVARIANT(result);
 
     bool retval = true;
     switch (functionId) {
     case InvokeMethod:
         if (npObject->_class->invoke) {
             v8::Handle<v8::String> functionName = v8::Handle<v8::String>::Cast(info.Data());
             NPIdentifier identifier = getStringIdentifier(functionName);
             retval = npObject->_class->invoke(npObject, identifier, npArgs.get(), numArgs, &result);
         }
         break;
     case InvokeConstruct:
         if (npObject->_class->construct)
             retval = npObject->_class->construct(npObject, npArgs.get(), numArgs, &result);
         break;
     case InvokeDefault:
         if (npObject->_class->invokeDefault)
             retval = npObject->_class->invokeDefault(npObject, npArgs.get(), numArgs, &result);
         break;
     default:
         break;
     }
 
     if (!retval)
-        throwError(v8GeneralError, "Error calling method on NPObject.", info.GetIsolate());
+        throwError(v8GeneralError, "Error calling method on NPObject.", isolate);
 
     for (int i = 0; i < numArgs; i++)
         _NPN_ReleaseVariantValue(&npArgs[i]);
 
     // Unwrap return values.
     v8::Handle<v8::Value> returnValue;
     if (_NPN_IsAlive(npObject))
-        returnValue = convertNPVariantToV8Object(&result, npObject, info.GetIsolate());
+        returnValue = convertNPVariantToV8Object(&result, npObject, isolate);
     _NPN_ReleaseVariantValue(&result);
 
     v8SetReturnValue(info, returnValue);
 }
 
 
 void npObjectMethodHandler(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     return npObjectInvokeImpl(info, InvokeMethod);
 }
@@ skipping 319 matching lines @@
     v8::HandleScope scope(isolate);
     v8::Handle<v8::Object> wrapper = staticNPObjectMap().newLocal(object, isolate);
     if (!wrapper.IsEmpty()) {
         V8DOMWrapper::clearNativeInfo(wrapper, npObjectTypeInfo());
         staticNPObjectMap().removeAndDispose(object);
         _NPN_ReleaseObject(object);
     }
 }
 
 } // namespace WebCore