Index: third_party/WebKit/Source/bindings/core/v8/ToV8.h |
diff --git a/third_party/WebKit/Source/bindings/core/v8/ToV8.h b/third_party/WebKit/Source/bindings/core/v8/ToV8.h |
index 0b35902f74b0966d9beceadbb7b9854ed413f81d..1ebd733aac239245971c6a65e54b76e4c9e4aca3 100644 |
--- a/third_party/WebKit/Source/bindings/core/v8/ToV8.h |
+++ b/third_party/WebKit/Source/bindings/core/v8/ToV8.h |
@@ -185,17 +185,19 @@ inline v8::Local<v8::Value> toV8(const ToV8UndefinedGenerator& value, v8::Local |
// ScriptValue |
-inline v8::Local<v8::Value> toV8(const ScriptValue& value, v8::Local<v8::Object> creationContext, v8::Isolate*) |
+inline v8::Local<v8::Value> toV8(const ScriptValue& value, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) |
{ |
+ if (value.isEmpty()) |
+ return v8::Undefined(isolate); |
return value.v8Value(); |
} |
// Dictionary |
-inline v8::Local<v8::Value> toV8(const Dictionary& value, v8::Local<v8::Object> creationContext, v8::Isolate*) |
+inline v8::Local<v8::Value> toV8(const Dictionary& value, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) |
{ |
- RELEASE_NOTREACHED(); |
- return v8::Local<v8::Value>(); |
+ NOTREACHED(); |
+ return v8::Undefined(isolate); |
} |
inline v8::Local<v8::Value> toV8(const IDLDictionaryBase& value, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) |