Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(226)

Unified Diff: Source/bindings/tests/results/core/V8TestDictionaryDerived.cpp

Issue 768793002: Revert of IDL: Null values should be converted for non-nullable dictionary members (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 e332c5612219f9babf14116d14f3e664e0595506..5982e3377808d483a30f1cb06c097530ed091153 100644
--- a/Source/bindings/tests/results/core/V8TestDictionaryDerived.cpp
+++ b/Source/bindings/tests/results/core/V8TestDictionaryDerived.cpp
@@ -28,27 +28,21 @@
v8::Local<v8::Object> v8Object = v8Value->ToObject(isolate);
v8::TryCatch block;
v8::Local<v8::Value> derivedStringMemberValue = v8Object->Get(v8String(isolate, "derivedStringMember"));
- if (block.HasCaught()) {
+ if (!derivedStringMemberValue.IsEmpty() && !isUndefinedOrNull(derivedStringMemberValue)) {
+ TOSTRING_VOID(V8StringResource<>, derivedStringMember, derivedStringMemberValue);
+ impl.setDerivedStringMember(derivedStringMember);
+ } else if (block.HasCaught()) {
exceptionState.rethrowV8Exception(block.Exception());
return;
}
- if (derivedStringMemberValue.IsEmpty() || derivedStringMemberValue->IsUndefined()) {
- // Do nothing.
- } else {
- TOSTRING_VOID(V8StringResource<>, derivedStringMember, derivedStringMemberValue);
- impl.setDerivedStringMember(derivedStringMember);
- }
v8::Local<v8::Value> derivedStringMemberWithDefaultValue = v8Object->Get(v8String(isolate, "derivedStringMemberWithDefault"));
- if (block.HasCaught()) {
+ if (!derivedStringMemberWithDefaultValue.IsEmpty() && !isUndefinedOrNull(derivedStringMemberWithDefaultValue)) {
+ TOSTRING_VOID(V8StringResource<>, derivedStringMemberWithDefault, derivedStringMemberWithDefaultValue);
+ impl.setDerivedStringMemberWithDefault(derivedStringMemberWithDefault);
+ } else if (block.HasCaught()) {
exceptionState.rethrowV8Exception(block.Exception());
return;
- }
- if (derivedStringMemberWithDefaultValue.IsEmpty() || derivedStringMemberWithDefaultValue->IsUndefined()) {
- // Do nothing.
- } else {
- TOSTRING_VOID(V8StringResource<>, derivedStringMemberWithDefault, derivedStringMemberWithDefaultValue);
- impl.setDerivedStringMemberWithDefault(derivedStringMemberWithDefault);
}
}

Powered by Google App Engine
This is Rietveld 408576698