diff options
Diffstat (limited to 'chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cpp.tmpl')
-rw-r--r-- | chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cpp.tmpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cpp.tmpl b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cpp.tmpl index 02cf3c0c248..20df71dae0d 100644 --- a/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cpp.tmpl +++ b/chromium/third_party/blink/renderer/bindings/templates/dictionary_v8.cpp.tmpl @@ -18,7 +18,7 @@ static const v8::Eternal<v8::Name>* eternal{{v8_class}}Keys(v8::Isolate* isolate {% endfor %} }; return V8PerIsolateData::From(isolate)->FindOrCreateEternalNameCache( - kKeys, kKeys, arraysize(kKeys)); + kKeys, kKeys, base::size(kKeys)); } {% endif %} @@ -92,7 +92,7 @@ void {{v8_class}}::ToImpl(v8::Isolate* isolate, v8::Local<v8::Value> v8Value, {{ {% endif %} {% if member.enum_values %} {{declare_enum_validation_variable(member.enum_values) | trim | indent}} - if (!IsValidEnum({{member.name}}CppValue, validValues, arraysize(validValues), "{{member.enum_type}}", exceptionState)) + if (!IsValidEnum({{member.name}}CppValue, validValues, base::size(validValues), "{{member.enum_type}}", exceptionState)) return; {% elif member.is_object %} if (!{{member.name}}CppValue.IsObject()) { @@ -150,7 +150,7 @@ bool toV8{{cpp_class}}(const {{cpp_class}}& impl, v8::Local<v8::Object> dictiona } else { {{member.name}}Value = {{member.v8_default_value}}; {{member.name}}HasValueOrDefault = true; - {% elif member.is_nullable %} + {% elif member.is_nullable and not member.has_explicit_presence %} } else { {{member.name}}Value = v8::Null(isolate); {{member.name}}HasValueOrDefault = true; |