Index: Source/WebKit/chromium/src/WebBindings.cpp |
diff --git a/Source/WebKit/chromium/src/WebBindings.cpp b/Source/WebKit/chromium/src/WebBindings.cpp |
index 21a9031d6d0d07e305a2f4ddc4da7dabc7fa2ee9..cec9aa251107750abe03008ade328dc03d8f85f9 100644 |
--- a/Source/WebKit/chromium/src/WebBindings.cpp |
+++ b/Source/WebKit/chromium/src/WebBindings.cpp |
@@ -290,9 +290,11 @@ static NPObject* makeIntArrayImpl(const WebVector<int>& data) |
static NPObject* makeStringArrayImpl(const WebVector<WebString>& data) |
{ |
v8::HandleScope handleScope; |
+ v8::Isolate* isolate = v8::Isolate::GetCurrent(); |
+ |
v8::Handle<v8::Array> result = v8::Array::New(data.size()); |
for (size_t i = 0; i < data.size(); ++i) |
- result->Set(i, data[i].data() ? v8::String::New(reinterpret_cast<const uint16_t*>((data[i].data())), data[i].length()) : v8::String::New("")); |
+ result->Set(i, v8String(String(data[i]), isolate)); |
DOMWindow* window = toDOMWindow(v8::Context::GetCurrent()); |
return npCreateV8ScriptObject(0, result, window); |