| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 372 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 383 WebCore::convertV8ObjectToNPVariant(object, root, result); | 383 WebCore::convertV8ObjectToNPVariant(object, root, result); |
| 384 } | 384 } |
| 385 | 385 |
| 386 v8::Handle<v8::Value> WebBindings::toV8Value(const NPVariant* variant) | 386 v8::Handle<v8::Value> WebBindings::toV8Value(const NPVariant* variant) |
| 387 { | 387 { |
| 388 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 388 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
| 389 if (variant->type == NPVariantType_Object) { | 389 if (variant->type == NPVariantType_Object) { |
| 390 NPObject* object = NPVARIANT_TO_OBJECT(*variant); | 390 NPObject* object = NPVARIANT_TO_OBJECT(*variant); |
| 391 V8NPObject* v8Object = npObjectToV8NPObject(object); | 391 V8NPObject* v8Object = npObjectToV8NPObject(object); |
| 392 if (!v8Object) | 392 if (!v8Object) |
| 393 return v8::Undefined(); | 393 return v8::Undefined(isolate); |
| 394 return convertNPVariantToV8Object(variant, v8Object->rootObject->frame()
->script()->windowScriptNPObject(), isolate); | 394 return convertNPVariantToV8Object(variant, v8Object->rootObject->frame()
->script()->windowScriptNPObject(), isolate); |
| 395 } | 395 } |
| 396 // Safe to pass 0 since we have checked the script object class to make sure
the | 396 // Safe to pass 0 since we have checked the script object class to make sure
the |
| 397 // argument is a primitive v8 type. | 397 // argument is a primitive v8 type. |
| 398 return convertNPVariantToV8Object(variant, 0, isolate); | 398 return convertNPVariantToV8Object(variant, 0, isolate); |
| 399 } | 399 } |
| 400 | 400 |
| 401 } // namespace WebKit | 401 } // namespace WebKit |
| OLD | NEW |