Change value type of timeout and maximumAge in PositionOptions

Source/bindings/v8/custom/V8GeolocationCustom.cpp

 /*
  * Copyright 2009, The Android Open Source Project
  *
  * 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 copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 67 matching lines @@
     }
     if (!timeoutValue->IsUndefined()) {
         v8::Local<v8::Number> timeoutNumber = timeoutValue->ToNumber();
         if (timeoutNumber.IsEmpty()) {
             succeeded = false;
             return nullptr;
         }
         double timeoutDouble = timeoutNumber->Value();
         // If the value is positive infinity, there's nothing to do.
         if (!(std::isinf(timeoutDouble) && timeoutDouble > 0)) {
-            v8::Local<v8::Int32> timeoutInt32 = timeoutValue->ToInt32();
-            if (timeoutInt32.IsEmpty()) {
-                succeeded = false;
-                return nullptr;
+            unsigned timeout;

[Inactive, 2014/05/22 13:21:07]

Could we use toUInt32(timeoutValue, Clamp, es) from V8Bindings.h?

[kihong, 2014/05/23 05:03:11]

Done, that's much simpler than now.
Thanks chris :)

+            // If the value is over max of unsigned, timeout is max of unsigned.
+            if (timeoutDouble >= std::numeric_limits<unsigned>::max()) {
+                timeout = std::numeric_limits<unsigned>::max();
+            } else if (timeoutDouble <= 0) {
+                timeout = 0;
+            } else {
+                v8::Local<v8::Uint32> timeoutUint32 = timeoutValue->ToUint32();
+                if (timeoutUint32.IsEmpty()) {
+                    succeeded = false;
+                    return nullptr;
+                }
+                timeout = timeoutUint32->Value();
             }
-            // Wrap to int32 and force non-negative to match behavior of window.setTimeout.
-            options->setTimeout(max(0, timeoutInt32->Value()));
+            options->setTimeout(timeout);
         }
     }
 
     v8::Local<v8::Value> maximumAgeValue = object->Get(v8AtomicString(isolate, "maximumAge"));
     if (maximumAgeValue.IsEmpty()) {
         succeeded = false;
         return nullptr;
     }
     if (!maximumAgeValue->IsUndefined()) {
         v8::Local<v8::Number> maximumAgeNumber = maximumAgeValue->ToNumber();
         if (maximumAgeNumber.IsEmpty()) {
             succeeded = false;
             return nullptr;
         }
         double maximumAgeDouble = maximumAgeNumber->Value();
         if (std::isinf(maximumAgeDouble) && maximumAgeDouble > 0) {
             // If the value is positive infinity, clear maximumAge.
             options->clearMaximumAge();
         } else {
-            v8::Local<v8::Int32> maximumAgeInt32 = maximumAgeValue->ToInt32();
-            if (maximumAgeInt32.IsEmpty()) {
-                succeeded = false;
-                return nullptr;
+            unsigned maximumAge;

[Inactive, 2014/05/22 13:21:07]

Ditto.

+            // If the value is over max of unsigned, maximunAge is max of unsigned.
+            if (maximumAgeDouble >= std::numeric_limits<unsigned>::max()) {
+                maximumAge = std::numeric_limits<unsigned>::max();
+            } else if (maximumAgeDouble <= 0) {
+                maximumAge = 0;
+            } else {
+                v8::Local<v8::Uint32> maximumAgeUint32 = maximumAgeValue->ToUint32();
+                if (maximumAgeUint32.IsEmpty()) {
+                    succeeded = false;
+                    return nullptr;
+                }
+                maximumAge = maximumAgeUint32->Value();
             }
-            // Wrap to int32 and force non-negative to match behavior of window.setTimeout.
-            options->setMaximumAge(max(0, maximumAgeInt32->Value()));
+            options->setMaximumAge(maximumAge);
         }
     }
 
     return options.release();
 }
 
 void V8Geolocation::getCurrentPositionMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     bool succeeded = false;
 
@@ skipping 38 matching lines @@
     if (!succeeded)
         return;
     ASSERT(positionOptions);
 
     Geolocation* geolocation = V8Geolocation::toNative(info.Holder());
     int watchId = geolocation->watchPosition(positionCallback.release(), positionErrorCallback.release(), positionOptions.release());
     v8SetReturnValue(info, watchId);
 }
 
 } // namespace WebCore