Index: Source/bindings/tests/results/V8TestExtendedEvent.cpp |
diff --git a/Source/bindings/tests/results/V8TestExtendedEvent.cpp b/Source/bindings/tests/results/V8TestExtendedEvent.cpp |
index 1f757e4396b575f56fc23a3e41bc15933680b154..c6bab16930472c2909a17d45ee63d62213d86a9b 100644 |
--- a/Source/bindings/tests/results/V8TestExtendedEvent.cpp |
+++ b/Source/bindings/tests/results/V8TestExtendedEvent.cpp |
@@ -115,10 +115,12 @@ static void constructor(const v8::FunctionCallbackInfo<v8::Value>& info) |
EventInit eventInit; |
if (info.Length() >= 2) { |
V8TRYCATCH_VOID(Dictionary, options, Dictionary(info[1], info.GetIsolate())); |
- if (!fillEventInit(eventInit, options)) |
+ ExceptionState exceptionState(info.Holder(), info.GetIsolate()); |
+ if (!fillEventInit(eventInit, options, exceptionState)) { |
+ exceptionState.throwIfNeeded(); |
return; |
+ } |
} |
- |
RefPtr<Event> event = Event::create(type, eventInit); |
v8::Handle<v8::Object> wrapper = info.Holder(); |
V8DOMWrapper::associateObjectWithWrapper<V8TestExtendedEvent>(event.release(), &V8TestExtendedEvent::wrapperTypeInfo, wrapper, info.GetIsolate(), WrapperConfiguration::Dependent); |
@@ -131,14 +133,19 @@ static const V8DOMConfiguration::AttributeConfiguration V8TestExtendedEventAttri |
{"keyLocation", EventV8Internal::keyLocationAttributeGetterCallback, 0, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */}, |
}; |
-bool fillEventInit(EventInit& eventInit, const Dictionary& options) |
+bool fillEventInit(EventInit& eventInit, const Dictionary& options, ExceptionState& exceptionState) |
{ |
- if (!fillTestEventInit(eventInit, options)) |
+ if (!fillTestEventInit(eventInit, options, exceptionState)) |
return false; |
- options.get("location", eventInit.location); |
- if (options.get("keyLocation", eventInit.location)) |
- UseCounter::countDeprecation(activeExecutionContext(), UseCounter::KeyboardEventKeyLocation); |
+ if (!options.convert("location", NormalConversion, eventInit.location, exceptionState)) |
+ return false; |
+ if (options.convert("keyLocation", NormalConversion, eventInit.location, exceptionState)) { |
+ if (options.hasProperty("keyLocation")) |
+ UseCounter::countDeprecation(activeExecutionContext(), UseCounter::KeyboardEventKeyLocation); |
+ } else { |
+ return false; |
+ } |
return true; |
} |