IDL compiler: simplify type conversion in Event Constructor

Source/bindings/v8/Dictionary.h

 /*
  * Copyright (C) 2010 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:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 99 matching lines @@
             resetPerPropertyContext();
         }
 
         const String& interfaceName() const { return m_interfaceName; }
         const String& methodName() const { return m_methodName; }
         bool forConstructor() const { return m_methodName.isEmpty(); }
         ExceptionState& exceptionState() const { return m_exceptionState; }
 
         bool isNullable() const { return m_isNullable; }
         String typeName() const { return m_propertyTypeName; }
-        IntegerConversionConfiguration numberConversion() const { return m_numberConversion; }
 
-        ConversionContext& withAttributes(bool, IntegerConversionConfiguration, const String&);
-        ConversionContext& withAttributes(bool, IntegerConversionConfiguration);
-        ConversionContext& withAttributes(bool, const String&);
-        ConversionContext& withAttributes(bool);
-        ConversionContext& withAttributes(const String&);
+        ConversionContext& setConversionType(const String&, bool);
 
         void throwTypeError(const String& detail);
 
         void resetPerPropertyContext();
 
     private:
         const String m_interfaceName;
         const String m_methodName;
         ExceptionState& m_exceptionState;
         bool m_dirty;
 
         bool m_isNullable;
         String m_propertyTypeName;
-        IntegerConversionConfiguration m_numberConversion;
     };
 
     class ConversionContextScope {
     public:
         ConversionContextScope(ConversionContext& context)
             : m_context(context) { }
         ~ConversionContextScope()
         {
             m_context.resetPerPropertyContext();
         }
@@ skipping 140 matching lines @@
 
 template<typename T> bool Dictionary::convert(ConversionContext& context, const String& key, T& value) const
 {
     ConversionContextScope scope(context);
 
     v8::Local<v8::Value> v8Value;
     if (!getKey(key, v8Value))
         return true;
 
     bool ok = false;
-    value = IntegralTypeTraits<T>::toIntegral(v8Value, context.numberConversion(), ok);
-    if (!ok) {
-        V8TRYCATCH_RETURN(v8::Local<v8::Number>, v8Number, v8Value->ToNumber(), false);
-        if (v8Number.IsEmpty()) {
-            context.throwTypeError(ExceptionMessages::incorrectPropertyType(key, "does not have type " + IntegralTypeTraits<T>::typeName() + "."));
-        } else {
-            ASSERT(context.numberConversion() == EnforceRange);
-            context.throwTypeError(ExceptionMessages::incorrectPropertyType(key, "is not a finite number."));
-        }
-        return false;
-    }
-    return true;
+    value = IntegralTypeTraits<T>::toIntegral(v8Value, NormalConversion, ok);
+    if (ok)
+        return true;
+
+    V8TRYCATCH_RETURN(v8::Local<v8::Number>, v8Number, v8Value->ToNumber(), false);
+    ASSERT(v8Number.IsEmpty());
+    context.throwTypeError(ExceptionMessages::incorrectPropertyType(key, "does not have type " + IntegralTypeTraits<T>::typeName() + "."));
+    return false;
 }
 
 template<typename T> bool Dictionary::convert(ConversionContext& context, const String& key, RefPtr<T>& value) const
 {
     ConversionContextScope scope(context);
 
     if (!get(key, value))
         return true;
 
-    if (!value) {
-        v8::Local<v8::Value> v8Value;
-        getKey(key, v8Value);
-        if (!(context.isNullable() && WebCore::isUndefinedOrNull(v8Value))) {
-            context.throwTypeError(ExceptionMessages::incorrectPropertyType(key, "does not have " + (context.typeName().isEmpty() ? String("the expected type.") : ("a " + context.typeName() + " type."))));
-            return false;
-        }
-    }
-    return true;
+    if (value)
+        return true;
+
+    v8::Local<v8::Value> v8Value;
+    getKey(key, v8Value);
+    if (context.isNullable() && WebCore::isUndefinedOrNull(v8Value))
+        return true;
+
+    context.throwTypeError(ExceptionMessages::incorrectPropertyType(key, "does not have a " + context.typeName() + " type."));
+    return false;
 }
 
 }
 
 #endif // Dictionary_h