[bindings] Make sure v8::Isolate is being passed to toXXX() conversion routines as argument.

Source/bindings/core/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 155 matching lines @@
     static const unsigned numberOfValues = 65536; // 2^16
 };
 
 template <>
 struct IntTypeLimits<uint16_t> {
     static const unsigned short maxValue = 65535;
     static const unsigned numberOfValues = 65536; // 2^16
 };
 
 template <typename T>
-static inline T toSmallerInt(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, const char* typeName, ExceptionState& exceptionState)
+static inline T toSmallerInt(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, const char* typeName, ExceptionState& exceptionState)
 {
     typedef IntTypeLimits<T> LimitsTrait;
 
     // Fast case. The value is already a 32-bit integer in the right range.
     if (value->IsInt32()) {
         int32_t result = value->Int32Value();
         if (result >= LimitsTrait::minValue && result <= LimitsTrait::maxValue)
             return static_cast<T>(result);
         if (configuration == EnforceRange) {
             exceptionState.throwTypeError("Value is outside the '" + String(typeName) + "' value range.");
             return 0;
         }
         if (configuration == Clamp)
             return clampTo<T>(result);
         result %= LimitsTrait::numberOfValues;
         return static_cast<T>(result > LimitsTrait::maxValue ? result - LimitsTrait::numberOfValues : result);
     }
 
     v8::Local<v8::Number> numberObject;
     if (value->IsNumber()) {
         numberObject = value.As<v8::Number>();
     } else {
-        v8::Isolate* isolate = v8::Isolate::GetCurrent();
         // Can the value be converted to a number?
         v8::TryCatch block(isolate);
         numberObject = value->ToNumber(isolate);
         if (block.HasCaught()) {
             exceptionState.rethrowV8Exception(block.Exception());
             return 0;
         }
     }
     ASSERT(!numberObject.IsEmpty());
 
@@ skipping 10 matching lines @@
     if (std::isinf(numberValue))
         return 0;
 
     numberValue = numberValue < 0 ? -floor(fabs(numberValue)) : floor(fabs(numberValue));
     numberValue = fmod(numberValue, LimitsTrait::numberOfValues);
 
     return static_cast<T>(numberValue > LimitsTrait::maxValue ? numberValue - LimitsTrait::numberOfValues : numberValue);
 }
 
 template <typename T>
-static inline T toSmallerUInt(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, const char* typeName, ExceptionState& exceptionState)
+static inline T toSmallerUInt(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, const char* typeName, ExceptionState& exceptionState)
 {
     typedef IntTypeLimits<T> LimitsTrait;
 
     // Fast case. The value is a 32-bit signed integer - possibly positive?
     if (value->IsInt32()) {
         int32_t result = value->Int32Value();
         if (result >= 0 && result <= LimitsTrait::maxValue)
             return static_cast<T>(result);
         if (configuration == EnforceRange) {
             exceptionState.throwTypeError("Value is outside the '" + String(typeName) + "' value range.");
             return 0;
         }
         if (configuration == Clamp)
             return clampTo<T>(result);
         return static_cast<T>(result);
     }
 
     v8::Local<v8::Number> numberObject;
     if (value->IsNumber()) {
         numberObject = value.As<v8::Number>();
     } else {
-        v8::Isolate* isolate = v8::Isolate::GetCurrent();
         // Can the value be converted to a number?
         v8::TryCatch block(isolate);
         numberObject = value->ToNumber(isolate);
         if (block.HasCaught()) {
             exceptionState.rethrowV8Exception(block.Exception());
             return 0;
         }
     }
     ASSERT(!numberObject.IsEmpty());
 
     if (configuration == EnforceRange)
         return enforceRange(numberObject->Value(), 0, LimitsTrait::maxValue, typeName, exceptionState);
 
     double numberValue = numberObject->Value();
 
     if (std::isnan(numberValue) || !numberValue)
         return 0;
 
     if (configuration == Clamp)
         return clampTo<T>(numberValue);
 
     if (std::isinf(numberValue))
         return 0;
 
     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, ExceptionState& exceptionState)
+int8_t toInt8(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
 {
-    return toSmallerInt<int8_t>(value, configuration, "byte", exceptionState);
+    return toSmallerInt<int8_t>(isolate, value, configuration, "byte", exceptionState);
 }
 
-int8_t toInt8(v8::Handle<v8::Value> value)
+int8_t toInt8(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     NonThrowableExceptionState exceptionState;
-    return toInt8(value, NormalConversion, exceptionState);
+    return toInt8(isolate, value, NormalConversion, exceptionState);
 }
 
-uint8_t toUInt8(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
+uint8_t toUInt8(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
 {
-    return toSmallerUInt<uint8_t>(value, configuration, "octet", exceptionState);
+    return toSmallerUInt<uint8_t>(isolate, value, configuration, "octet", exceptionState);
 }
 
-uint8_t toUInt8(v8::Handle<v8::Value> value)
+uint8_t toUInt8(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     NonThrowableExceptionState exceptionState;
-    return toUInt8(value, NormalConversion, exceptionState);
+    return toUInt8(isolate, value, NormalConversion, exceptionState);
 }
 
-int16_t toInt16(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
+int16_t toInt16(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
 {
-    return toSmallerInt<int16_t>(value, configuration, "short", exceptionState);
+    return toSmallerInt<int16_t>(isolate, value, configuration, "short", exceptionState);
 }
 
-int16_t toInt16(v8::Handle<v8::Value> value)
+int16_t toInt16(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     NonThrowableExceptionState exceptionState;
-    return toInt16(value, NormalConversion, exceptionState);
+    return toInt16(isolate, value, NormalConversion, exceptionState);
 }
 
-uint16_t toUInt16(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
+uint16_t toUInt16(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
 {
-    return toSmallerUInt<uint16_t>(value, configuration, "unsigned short", exceptionState);
+    return toSmallerUInt<uint16_t>(isolate, value, configuration, "unsigned short", exceptionState);
 }
 
-uint16_t toUInt16(v8::Handle<v8::Value> value)
+uint16_t toUInt16(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     NonThrowableExceptionState exceptionState;
-    return toUInt16(value, NormalConversion, exceptionState);
+    return toUInt16(isolate, value, NormalConversion, exceptionState);
 }
 
-int32_t toInt32Slow(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
+int32_t toInt32Slow(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
 {
     ASSERT(!value->IsInt32());
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
     // Can the value be converted to a number?
     v8::TryCatch block(isolate);
     v8::Local<v8::Number> numberObject = value->ToNumber(isolate);
     if (block.HasCaught()) {
         exceptionState.rethrowV8Exception(block.Exception());
         return 0;
     }
 
     ASSERT(!numberObject.IsEmpty());
 
     double numberValue = numberObject->Value();
     if (configuration == EnforceRange)
         return enforceRange(numberValue, kMinInt32, kMaxInt32, "long", exceptionState);
 
     if (std::isnan(numberValue))
         return 0;
 
     if (configuration == Clamp)
         return clampTo<int32_t>(numberValue);
 
     if (std::isinf(numberValue))
         return 0;
 
     return numberObject->Int32Value();
 }
 
-int32_t toInt32(v8::Handle<v8::Value> value)
+int32_t toInt32(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     NonThrowableExceptionState exceptionState;
-    return toInt32(value, NormalConversion, exceptionState);
+    return toInt32(isolate, value, NormalConversion, exceptionState);
 }
 
-uint32_t toUInt32Slow(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
+uint32_t toUInt32Slow(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
 {
     ASSERT(!value->IsUint32());
     if (value->IsInt32()) {
         ASSERT(configuration != NormalConversion);
         int32_t result = value->Int32Value();
         if (result >= 0)
             return result;
         if (configuration == EnforceRange) {
             exceptionState.throwTypeError("Value is outside the 'unsigned long' value range.");
             return 0;
         }
         ASSERT(configuration == Clamp);
         return clampTo<uint32_t>(result);
     }
 
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
     // Can the value be converted to a number?
     v8::TryCatch block(isolate);
     v8::Local<v8::Number> numberObject = value->ToNumber(isolate);
     if (block.HasCaught()) {
         exceptionState.rethrowV8Exception(block.Exception());
         return 0;
     }
     ASSERT(!numberObject.IsEmpty());
 
     if (configuration == EnforceRange)
         return enforceRange(numberObject->Value(), 0, kMaxUInt32, "unsigned long", exceptionState);
 
     double numberValue = numberObject->Value();
 
     if (std::isnan(numberValue))
         return 0;
 
     if (configuration == Clamp)
         return clampTo<uint32_t>(numberValue);
 
     if (std::isinf(numberValue))
         return 0;
 
     return numberObject->Uint32Value();
 }
 
-uint32_t toUInt32(v8::Handle<v8::Value> value)
+uint32_t toUInt32(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     NonThrowableExceptionState exceptionState;
-    return toUInt32(value, NormalConversion, exceptionState);
+    return toUInt32(isolate, value, NormalConversion, exceptionState);
 }
 
-int64_t toInt64Slow(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
+int64_t toInt64Slow(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
 {
     ASSERT(!value->IsInt32());
 
     v8::Local<v8::Number> numberObject;
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
     // Can the value be converted to a number?
     v8::TryCatch block(isolate);
     numberObject = value->ToNumber(isolate);
     if (block.HasCaught()) {
         exceptionState.rethrowV8Exception(block.Exception());
         return 0;
     }
     ASSERT(!numberObject.IsEmpty());
 
     double numberValue = numberObject->Value();
 
     if (configuration == EnforceRange)
         return enforceRange(numberValue, -kJSMaxInteger, kJSMaxInteger, "long long", exceptionState);
 
     if (std::isnan(numberValue) || std::isinf(numberValue))
         return 0;
 
     // NaNs and +/-Infinity should be 0, otherwise modulo 2^64.
     unsigned long long integer;
     doubleToInteger(numberValue, integer);
     return integer;
 }
 
-int64_t toInt64(v8::Handle<v8::Value> value)
+int64_t toInt64(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     NonThrowableExceptionState exceptionState;
-    return toInt64(value, NormalConversion, exceptionState);
+    return toInt64(isolate, value, NormalConversion, exceptionState);
 }
 
-uint64_t toUInt64Slow(v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
+uint64_t toUInt64Slow(v8::Isolate* isolate, v8::Handle<v8::Value> value, IntegerConversionConfiguration configuration, ExceptionState& exceptionState)
 {
     ASSERT(!value->IsUint32());
     if (value->IsInt32()) {
         ASSERT(configuration != NormalConversion);
         int32_t result = value->Int32Value();
         if (result >= 0)
             return result;
         if (configuration == EnforceRange) {
             exceptionState.throwTypeError("Value is outside the 'unsigned long long' value range.");
             return 0;
         }
         ASSERT(configuration == Clamp);
         return clampTo<uint64_t>(result);
     }
 
     v8::Local<v8::Number> numberObject;
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
     // Can the value be converted to a number?
     v8::TryCatch block(isolate);
     numberObject = value->ToNumber(isolate);
     if (block.HasCaught()) {
         exceptionState.rethrowV8Exception(block.Exception());
         return 0;
     }
     ASSERT(!numberObject.IsEmpty());
 
     double numberValue = numberObject->Value();
 
     if (configuration == EnforceRange)
         return enforceRange(numberValue, 0, kJSMaxInteger, "unsigned long long", exceptionState);
 
     if (std::isnan(numberValue))
         return 0;
 
     if (configuration == Clamp)
         return clampTo<uint64_t>(numberValue);
 
     if (std::isinf(numberValue))
         return 0;
 
     // NaNs and +/-Infinity should be 0, otherwise modulo 2^64.
     unsigned long long integer;
     doubleToInteger(numberValue, integer);
     return integer;
 }
 
-uint64_t toUInt64(v8::Handle<v8::Value> value)
+uint64_t toUInt64(v8::Isolate* isolate, v8::Handle<v8::Value> value)
 {
     NonThrowableExceptionState exceptionState;
-    return toUInt64(value, NormalConversion, exceptionState);
+    return toUInt64(isolate, value, NormalConversion, exceptionState);
 }
 
-float toRestrictedFloat(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+float toRestrictedFloat(v8::Isolate* isolate, v8::Handle<v8::Value> value, ExceptionState& exceptionState)
 {
-    float numberValue = toFloat(value, exceptionState);
+    float numberValue = toFloat(isolate, value, exceptionState);
     if (exceptionState.hadException())
         return 0;
     if (!std::isfinite(numberValue)) {
         exceptionState.throwTypeError("The provided float value is non-finite.");
         return 0;
     }
     return numberValue;
 }
 
-double toDoubleSlow(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+double toDoubleSlow(v8::Isolate* isolate, v8::Handle<v8::Value> value, ExceptionState& exceptionState)
 {
     ASSERT(!value->IsNumber());
-    v8::Isolate* isolate = v8::Isolate::GetCurrent();
     v8::TryCatch block(isolate);
     double doubleValue = value->NumberValue();
     if (block.HasCaught()) {
         exceptionState.rethrowV8Exception(block.Exception());
         return 0;
     }
     return doubleValue;
 }
 
-double toRestrictedDouble(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+double toRestrictedDouble(v8::Isolate* isolate, v8::Handle<v8::Value> value, ExceptionState& exceptionState)
 {
-    double numberValue = toDouble(value, exceptionState);
+    double numberValue = toDouble(isolate, value, exceptionState);
     if (exceptionState.hadException())
         return 0;
     if (!std::isfinite(numberValue)) {
         exceptionState.throwTypeError("The provided double value is non-finite.");
         return 0;
     }
     return numberValue;
 }
 
-String toByteString(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+String toByteString(v8::Isolate* isolate, v8::Handle<v8::Value> value, ExceptionState& exceptionState)
 {
     // Handle null default value.
     if (value.IsEmpty())
         return String();
 
     // From the Web IDL spec: http://heycam.github.io/webidl/#es-ByteString
     if (value.IsEmpty())
         return String();
 
     // 1. Let x be ToString(v)
     v8::Local<v8::String> stringObject;
     if (value->IsString()) {
         stringObject = value.As<v8::String>();
     } else {
-        v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::TryCatch block(isolate);
         stringObject = value->ToString(isolate);
         if (block.HasCaught()) {
             exceptionState.rethrowV8Exception(block.Exception());
             return String();
         }
     }
 
     String x = toCoreString(stringObject);
 
@@ skipping 105 matching lines @@
         }
         // 3. Set i to i+1.
         ++i;
     }
 
     // 6. Return U.
     ASSERT(u.length() == string.length());
     return u.toString();
 }
 
-String toUSVString(v8::Handle<v8::Value> value, ExceptionState& exceptionState)
+String toUSVString(v8::Isolate* isolate, v8::Handle<v8::Value> value, ExceptionState& exceptionState)
 {
     // http://heycam.github.io/webidl/#es-USVString
     if (value.IsEmpty())
         return String();
 
     v8::Local<v8::String> stringObject;
     if (value->IsString()) {
         stringObject = value.As<v8::String>();
     } else {
-        v8::Isolate* isolate = v8::Isolate::GetCurrent();
         v8::TryCatch block(isolate);
         stringObject = value->ToString(isolate);
         if (block.HasCaught()) {
             exceptionState.rethrowV8Exception(block.Exception());
             return String();
         }
     }
 
     // USVString is identical to DOMString except that "convert a
     // DOMString to a sequence of Unicode characters" is used subsequently
@@ skipping 337 matching lines @@
 {
     v8ConstructorAttributeGetter(info);
 }
 
 void v8ConstructorAttributeGetterAsAccessor(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     v8ConstructorAttributeGetter(info);
 }
 
 } // namespace blink