Index: Source/bindings/tests/results/core/V8TestDictionaryDerived.cpp |
diff --git a/Source/bindings/tests/results/core/V8TestDictionaryDerived.cpp b/Source/bindings/tests/results/core/V8TestDictionaryDerived.cpp |
index 189661495ebe5faf5fd5aecea5c3f49cbf5bd844..df5d4a7c6df08a0e71500a9269b79424965d71a1 100644 |
--- a/Source/bindings/tests/results/core/V8TestDictionaryDerived.cpp |
+++ b/Source/bindings/tests/results/core/V8TestDictionaryDerived.cpp |
@@ -12,45 +12,49 @@ |
namespace blink { |
-void V8TestDictionaryDerivedImplementedAs::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, TestDictionaryDerivedImplementedAs& impl, ExceptionState& exceptionState) |
+bool V8TestDictionaryDerivedImplementedAs::toImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, TestDictionaryDerivedImplementedAs& impl, ExceptionState& exceptionState) |
{ |
if (isUndefinedOrNull(v8Value)) |
- return; |
+ return true; |
if (!v8Value->IsObject()) { |
exceptionState.throwTypeError("cannot convert to dictionary."); |
- return; |
+ return false; |
} |
- V8TestDictionary::toImpl(isolate, v8Value, impl, exceptionState); |
- if (exceptionState.hadException()) |
- return; |
+ if (!V8TestDictionary::toImpl(isolate, v8Value, impl, exceptionState)) |
+ return false; |
v8::Local<v8::Object> v8Object = v8Value->ToObject(isolate); |
v8::TryCatch block; |
v8::Local<v8::Value> derivedStringMemberValue = v8Object->Get(v8String(isolate, "derivedStringMember")); |
if (block.HasCaught()) { |
exceptionState.rethrowV8Exception(block.Exception()); |
- return; |
+ return false; |
} |
if (derivedStringMemberValue.IsEmpty() || derivedStringMemberValue->IsUndefined()) { |
// Do nothing. |
} else { |
- TOSTRING_VOID(V8StringResource<>, derivedStringMember, derivedStringMemberValue); |
+ V8StringResource<> derivedStringMember = derivedStringMemberValue; |
+ if (!derivedStringMember.prepare(exceptionState)) |
+ return false; |
impl.setDerivedStringMember(derivedStringMember); |
} |
v8::Local<v8::Value> derivedStringMemberWithDefaultValue = v8Object->Get(v8String(isolate, "derivedStringMemberWithDefault")); |
if (block.HasCaught()) { |
exceptionState.rethrowV8Exception(block.Exception()); |
- return; |
+ return false; |
} |
if (derivedStringMemberWithDefaultValue.IsEmpty() || derivedStringMemberWithDefaultValue->IsUndefined()) { |
// Do nothing. |
} else { |
- TOSTRING_VOID(V8StringResource<>, derivedStringMemberWithDefault, derivedStringMemberWithDefaultValue); |
+ V8StringResource<> derivedStringMemberWithDefault = derivedStringMemberWithDefaultValue; |
+ if (!derivedStringMemberWithDefault.prepare(exceptionState)) |
+ return false; |
impl.setDerivedStringMemberWithDefault(derivedStringMemberWithDefault); |
} |
+ return true; |
} |
v8::Local<v8::Value> toV8(const TestDictionaryDerivedImplementedAs& impl, v8::Local<v8::Object> creationContext, v8::Isolate* isolate) |