Improve handling of dictionary conversions.

Source/bindings/v8/V8Binding.cpp

 /*
  * Copyright (C) 2006, 2007, 2008, 2009 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 239 matching lines @@
     }
 
     if (configuration == EnforceRange)
         return enforceRange(numberObject->Value(), 0, LimitsTrait::maxValue, ok);
 
     // Does the value convert to nan or to an infinity?
     double numberValue = numberObject->Value();
     if (std::isnan(numberValue) || std::isinf(numberValue) || !numberValue)
         return 0;
 
+    if (configuration == Clamp)
+        return clampTo<T>(numberObject->Value());
+
     numberValue = numberValue < 0 ? -floor(fabs(numberValue)) : floor(fabs(numberValue));
     return static_cast<T>(fmod(numberValue, LimitsTrait::numberOfValues));
 }
 
 int8_t toInt8(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, bool& ok)
 {
     return toSmallerInt<int8_t>(value, configuration, ok);
 }
 
 uint8_t toUInt8(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, bool& ok)
@@ skipping 13 matching lines @@
 
 int32_t toInt32(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, bool& ok)
 {
     ok = true;
 
     // Fast case. The value is already a 32-bit integer.
     if (value->IsInt32())
         return value->Int32Value();
 
     // Can the value be converted to a number?
-    v8::Local<v8::Number> numberObject = value->ToNumber();
+    ok = false;
+    V8TRYCATCH_RETURN(v8::Local<v8::Number>, numberObject, value->ToNumber(), 0);
     if (numberObject.IsEmpty()) {
-        ok = false;
         return 0;
     }
+    ok = true;
 
     if (configuration == EnforceRange)
         return enforceRange(numberObject->Value(), kMinInt32, kMaxInt32, ok);
 
     // Does the value convert to nan or to an infinity?
     double numberValue = numberObject->Value();
     if (std::isnan(numberValue) || std::isinf(numberValue))
         return 0;
-    return numberObject->Int32Value();
+
+    if (configuration == Clamp)
+        return clampTo<int32_t>(numberObject->Value());
+
+    V8TRYCATCH_RETURN(int32_t, result, numberObject->Int32Value(), 0);
+    return result;
 }
 
 uint32_t toUInt32(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, bool& ok)
 {
     ok = true;
 
     // Fast case. The value is already a 32-bit unsigned integer.
     if (value->IsUint32())
         return value->Uint32Value();
 
     // Fast case. The value is a 32-bit signed integer - possibly positive?
     if (value->IsInt32()) {
         int32_t result = value->Int32Value();
         if (result >= 0)
             return result;
         if (configuration == EnforceRange) {
             ok = false;
             return 0;
         }
         return result;
     }
 
     // Can the value be converted to a number?
-    v8::Local<v8::Number> numberObject = value->ToNumber();
+    ok = false;
+    V8TRYCATCH_RETURN(v8::Local<v8::Number>, numberObject, value->ToNumber(), 0);
     if (numberObject.IsEmpty()) {
-        ok = false;
         return 0;
     }
+    ok = true;
 
     if (configuration == EnforceRange)
         return enforceRange(numberObject->Value(), 0, kMaxUInt32, ok);
 
     // Does the value convert to nan or to an infinity?
     double numberValue = numberObject->Value();
     if (std::isnan(numberValue) || std::isinf(numberValue))
         return 0;
-    return numberObject->Uint32Value();
+
+    if (configuration == Clamp)
+        return clampTo<uint32_t>(numberObject->Value());
+
+    V8TRYCATCH_RETURN(uint32_t, result, numberObject->Uint32Value(), 0);
+    return result;
 }
 
 int64_t toInt64(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, bool& ok)
 {
     ok = true;
 
     // Fast case. The value is a 32-bit integer.
     if (value->IsInt32())
         return value->Int32Value();
 
     // Can the value be converted to a number?
     v8::Local<v8::Number> numberObject = value->ToNumber();
     if (numberObject.IsEmpty()) {
         ok = false;
         return 0;
     }
 
     double x = numberObject->Value();
 
     if (configuration == EnforceRange)
         return enforceRange(x, -kJSMaxInteger, kJSMaxInteger, ok);
 
+    // Does the value convert to nan or to an infinity?
+    if (std::isnan(x) || std::isinf(x))
+        return 0;
+
     // NaNs and +/-Infinity should be 0, otherwise modulo 2^64.
     unsigned long long integer;
     doubleToInteger(x, integer);
     return integer;
 }
 
 uint64_t toUInt64(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, bool& ok)
 {
     ok = true;
 
@@ skipping 18 matching lines @@
     if (numberObject.IsEmpty()) {
         ok = false;
         return 0;
     }
 
     double x = numberObject->Value();
 
     if (configuration == EnforceRange)
         return enforceRange(x, 0, kJSMaxInteger, ok);
 
+    // Does the value convert to nan or to an infinity?
+    if (std::isnan(x) || std::isinf(x))
+        return 0;
+
     // NaNs and +/-Infinity should be 0, otherwise modulo 2^64.
     unsigned long long integer;
     doubleToInteger(x, integer);
     return integer;
 }
 
 v8::Handle<v8::FunctionTemplate> createRawTemplate(v8::Isolate* isolate)
 {
     v8::HandleScope scope(isolate);
     v8::Local<v8::FunctionTemplate> result = v8::FunctionTemplate::New(V8ObjectConstructor::isValidConstructorMode);
@@ skipping 196 matching lines @@
         return mainThreadIsolate();
     return v8::Isolate::GetCurrent();
 }
 
 v8::Isolate* toIsolate(Frame* frame)
 {
     return frame->script().isolate();
 }
 
 } // namespace WebCore