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 19 matching lines @@
 #include "V8PositionErrorCallback.h"
 #include "bindings/v8/V8Binding.h"
 #include "bindings/v8/V8Callback.h"
 #include "modules/geolocation/Geolocation.h"
 
 using namespace std;
 using namespace WTF;
 
 namespace WebCore {
 
-static PassRefPtrWillBeRawPtr<PositionOptions> createPositionOptions(v8::Local<v8::Value> value, v8::Isolate* isolate, bool& succeeded)
+static PassRefPtrWillBeRawPtr<PositionOptions> createPositionOptions(v8::Local<v8::Value> value, v8::Isolate* isolate, bool& succeeded, ExceptionState& exceptionState)
 {
     succeeded = true;
 
     // Create default options.
     RefPtrWillBeRawPtr<PositionOptions> options = PositionOptions::create();
 
     // Argument is optional (hence undefined is allowed), and null is allowed.
     if (isUndefinedOrNull(value)) {
         // Use default options.
         return options.release();
@@ skipping 27 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;
+            if (timeoutDouble <= 0) {
+                options->setTimeout(0);
+            } else {
+                options->setTimeout(toUInt32(timeoutValue, Clamp, exceptionState));
             }
-            // Wrap to int32 and force non-negative to match behavior of window.setTimeout.
-            options->setTimeout(max(0, timeoutInt32->Value()));
         }
     }
 
     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;
+            if (maximumAgeDouble <= 0) {
+                options->setMaximumAge(0);
+            } else {
+                options->setMaximumAge(toUInt32(maximumAgeValue, Clamp, exceptionState));
             }
-            // Wrap to int32 and force non-negative to match behavior of window.setTimeout.
-            options->setMaximumAge(max(0, maximumAgeInt32->Value()));
         }
     }
 
     return options.release();
 }
 
 void V8Geolocation::getCurrentPositionMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     bool succeeded = false;
 
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "getCurrentPosition", "Geolocation", info.Holder(), info.GetIsolate());
 
     OwnPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8PositionCallback>(info[0], 1, succeeded, info.GetIsolate(), exceptionState);
     if (!succeeded)
         return;
     ASSERT(positionCallback);
 
     // Argument is optional (hence undefined is allowed), and null is allowed.
     OwnPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8PositionErrorCallback>(info[1], 2, succeeded, info.GetIsolate(), exceptionState, CallbackAllowUndefined | CallbackAllowNull);
     if (!succeeded)
         return;
 
-    RefPtrWillBeRawPtr<PositionOptions> positionOptions = createPositionOptions(info[2], info.GetIsolate(), succeeded);
+    RefPtrWillBeRawPtr<PositionOptions> positionOptions = createPositionOptions(info[2], info.GetIsolate(), succeeded, exceptionState);
     if (!succeeded)
         return;
     ASSERT(positionOptions);
 
     Geolocation* geolocation = V8Geolocation::toNative(info.Holder());
     geolocation->getCurrentPosition(positionCallback.release(), positionErrorCallback.release(), positionOptions.release());
 }
 
 void V8Geolocation::watchPositionMethodCustom(const v8::FunctionCallbackInfo<v8::Value>& info)
 {
     bool succeeded = false;
 
     ExceptionState exceptionState(ExceptionState::ExecutionContext, "watchCurrentPosition", "Geolocation", info.Holder(), info.GetIsolate());
 
     OwnPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8PositionCallback>(info[0], 1, succeeded, info.GetIsolate(), exceptionState);
     if (!succeeded)
         return;
     ASSERT(positionCallback);
 
     // Argument is optional (hence undefined is allowed), and null is allowed.
     OwnPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8PositionErrorCallback>(info[1], 2, succeeded, info.GetIsolate(), exceptionState, CallbackAllowUndefined | CallbackAllowNull);
     if (!succeeded)
         return;
 
-    RefPtrWillBeRawPtr<PositionOptions> positionOptions = createPositionOptions(info[2], info.GetIsolate(), succeeded);
+    RefPtrWillBeRawPtr<PositionOptions> positionOptions = createPositionOptions(info[2], info.GetIsolate(), succeeded, exceptionState);
     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