Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / web / WebArrayBufferConverter.cpp

diff --git a/src/third_party/WebKit/Source/web/WebArrayBufferConverter.cpp b/src/third_party/WebKit/Source/web/WebArrayBufferConverter.cpp
index 32d9c41..58d7a52 100644 (file)
--- a/src/third_party/WebKit/Source/web/WebArrayBufferConverter.cpp
+++ b/src/third_party/WebKit/Source/web/WebArrayBufferConverter.cpp
@@ -31,26 +31,24 @@
 #include "config.h"
 #include "public/web/WebArrayBufferConverter.h"
 
-#include "bindings/v8/custom/V8ArrayBufferCustom.h"
+#include "bindings/core/v8/custom/V8ArrayBufferCustom.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/PassOwnPtr.h"
 
-using namespace WebCore;
-
 namespace blink {
 
-v8::Handle<v8::Value> WebArrayBufferConverter::toV8Value(WebArrayBuffer* buffer)
+v8::Handle<v8::Value> WebArrayBufferConverter::toV8Value(WebArrayBuffer* buffer, v8::Handle<v8::Object> creationContext, v8::Isolate* isolate)
 {
     if (!buffer)
         return v8::Handle<v8::Value>();
-    return toV8(*buffer, v8::Handle<v8::Object>(), v8::Isolate::GetCurrent());
+    return toV8(*buffer, creationContext, isolate);
 }
 
-WebArrayBuffer* WebArrayBufferConverter::createFromV8Value(v8::Handle<v8::Value> value)
+WebArrayBuffer* WebArrayBufferConverter::createFromV8Value(v8::Handle<v8::Value> value, v8::Isolate* isolate)
 {
-    if (!V8ArrayBuffer::hasInstance(value, v8::Isolate::GetCurrent()))
+    if (!V8ArrayBuffer::hasInstance(value, isolate))
         return 0;
-    WTF::ArrayBuffer* buffer = V8ArrayBuffer::toNative(value->ToObject());
+    ArrayBuffer* buffer = V8ArrayBuffer::toImpl(value->ToObject());
     return new WebArrayBuffer(buffer);
 }