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 365 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
376 blink::pushExceptionHandler(handler, data); | 376 blink::pushExceptionHandler(handler, data); |
377 } | 377 } |
378 | 378 |
379 void WebBindings::popExceptionHandler() | 379 void WebBindings::popExceptionHandler() |
380 { | 380 { |
381 blink::popExceptionHandler(); | 381 blink::popExceptionHandler(); |
382 } | 382 } |
383 | 383 |
384 void WebBindings::toNPVariant(v8::Local<v8::Value> object, NPObject* root, NPVar
iant* result) | 384 void WebBindings::toNPVariant(v8::Local<v8::Value> object, NPObject* root, NPVar
iant* result) |
385 { | 385 { |
386 convertV8ObjectToNPVariant(object, root, result, v8::Isolate::GetCurrent()); | 386 convertV8ObjectToNPVariant(v8::Isolate::GetCurrent(), object, root, result); |
387 } | 387 } |
388 | 388 |
389 v8::Handle<v8::Value> WebBindings::toV8Value(const NPVariant* variant) | 389 v8::Handle<v8::Value> WebBindings::toV8Value(const NPVariant* variant) |
390 { | 390 { |
391 v8::Isolate* isolate = v8::Isolate::GetCurrent(); | 391 v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
392 if (variant->type == NPVariantType_Object) { | 392 if (variant->type == NPVariantType_Object) { |
393 NPObject* object = NPVARIANT_TO_OBJECT(*variant); | 393 NPObject* object = NPVARIANT_TO_OBJECT(*variant); |
394 V8NPObject* v8Object = npObjectToV8NPObject(object); | 394 V8NPObject* v8Object = npObjectToV8NPObject(object); |
395 if (!v8Object) | 395 if (!v8Object) |
396 return v8::Undefined(isolate); | 396 return v8::Undefined(isolate); |
397 return convertNPVariantToV8Object(variant, v8Object->rootObject->frame()
->script().windowScriptNPObject(), isolate); | 397 return convertNPVariantToV8Object(isolate, variant, v8Object->rootObject
->frame()->script().windowScriptNPObject()); |
398 } | 398 } |
399 // Safe to pass 0 since we have checked the script object class to make sure
the | 399 // Safe to pass 0 since we have checked the script object class to make sure
the |
400 // argument is a primitive v8 type. | 400 // argument is a primitive v8 type. |
401 return convertNPVariantToV8Object(variant, 0, isolate); | 401 return convertNPVariantToV8Object(isolate, variant, 0); |
402 } | 402 } |
403 | 403 |
404 } // namespace blink | 404 } // namespace blink |
OLD | NEW |