Improve handling of dictionary conversions.

Source/bindings/tests/results/V8TestExtendedEvent.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 97 matching lines @@
 {
     if (info.Length() < 1) {
         throwTypeError(ExceptionMessages::failedToConstruct("TestExtendedEvent", "An event name must be provided."), info.GetIsolate());
         return;
     }
 
     V8TRYCATCH_FOR_V8STRINGRESOURCE_VOID(V8StringResource<>, type, info[0]);
     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);
     v8SetReturnValue(info, wrapper);
 }
 } // namespace EventV8Internal
 
 static const V8DOMConfiguration::AttributeConfiguration V8TestExtendedEventAttributes[] = {
     {"location", EventV8Internal::locationAttributeGetterCallback, 0, 0, 0, 0, static_cast<v8::AccessControl>(v8::DEFAULT), static_cast<v8::PropertyAttribute>(v8::None), 0 /* on instance */},
     {"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;
 }
 
 void V8TestExtendedEvent::constructorCallback(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     TRACE_EVENT_SCOPED_SAMPLING_STATE("Blink", "DOMConstructor");
     if (!info.IsConstructCall()) {
         throwTypeError(ExceptionMessages::failedToConstruct("TestExtendedEvent", "Please use the 'new' operator, this DOM object constructor cannot be called as a function."), info.GetIsolate());
         return;
     }
@@ skipping 79 matching lines @@
     return wrapper;
 }
 
 void V8TestExtendedEvent::derefObject(void* object)
 {
     fromInternalPointer(object)->deref();
 }
 
 } // namespace WebCore
 #endif // ENABLE(TEST)