| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2014 Google Inc. All rights reserved. | 2 * Copyright (C) 2014 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 17 matching lines...) Expand all Loading... |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "config.h" | 31 #include "config.h" |
| 32 #include "public/web/WebArrayBufferConverter.h" | 32 #include "public/web/WebArrayBufferConverter.h" |
| 33 | 33 |
| 34 #include "bindings/core/v8/V8ArrayBuffer.h" | 34 #include "bindings/core/v8/V8ArrayBuffer.h" |
| 35 | 35 |
| 36 namespace blink { | 36 namespace blink { |
| 37 | 37 |
| 38 v8::Local<v8::Value> WebArrayBufferConverter::toV8Value(WebArrayBuffer* buffer,
v8::Local<v8::Object> creationContext, v8::Isolate* isolate) | 38 v8::Local<v8::Value> WebArrayBufferConverter::toV8Value(WebArrayBuffer* buffer,
v8::Local<v8::Object> /* creationContext */, v8::Isolate* isolate) |
| 39 { | 39 { |
| 40 // We no longer use |creationContext| because it's often misused and points |
| 41 // to a context faked by user script. |
| 40 if (!buffer) | 42 if (!buffer) |
| 41 return v8::Local<v8::Value>(); | 43 return v8::Local<v8::Value>(); |
| 42 return toV8(PassRefPtr<DOMArrayBuffer>(*buffer), creationContext, isolate); | 44 return toV8(PassRefPtr<DOMArrayBuffer>(*buffer), isolate->GetCurrentContext(
)->Global(), isolate); |
| 43 } | 45 } |
| 44 | 46 |
| 45 WebArrayBuffer* WebArrayBufferConverter::createFromV8Value(v8::Local<v8::Value>
value, v8::Isolate* isolate) | 47 WebArrayBuffer* WebArrayBufferConverter::createFromV8Value(v8::Local<v8::Value>
value, v8::Isolate* isolate) |
| 46 { | 48 { |
| 47 if (!V8ArrayBuffer::hasInstance(value, isolate)) | 49 if (!V8ArrayBuffer::hasInstance(value, isolate)) |
| 48 return 0; | 50 return 0; |
| 49 return new WebArrayBuffer(V8ArrayBuffer::toImpl(value.As<v8::Object>())); | 51 return new WebArrayBuffer(V8ArrayBuffer::toImpl(value.As<v8::Object>())); |
| 50 } | 52 } |
| 51 | 53 |
| 52 } // namespace blink | 54 } // namespace blink |
| OLD | NEW |