Changeset 83115 in webkit

Timestamp:

Apr 6, 2011 4:01:30 PM (13 years ago)

Author:

commit-queue@webkit.org

Message:

2011-04-06 Leandro Gracia Gil <​leandrogracia@chromium.org>

Reviewed by Steve Block.

Make the style of createFunctionOnlyCallback in V8 consistent with the JavaScriptCore version.
​https://bugs.webkit.org/show_bug.cgi?id=57963

No new tests. LayoutTests/fast/dom/Geolocation/argument-types.html

• bindings/v8/V8Utilities.h: (WebCore::createFunctionOnlyCallback):
• bindings/v8/custom/V8GeolocationCustom.cpp: (WebCore::V8Geolocation::getCurrentPositionCallback): (WebCore::V8Geolocation::watchPositionCallback):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/v8/V8Utilities.h (modified) (2 diffs)
• bindings/v8/custom/V8GeolocationCustom.cpp (modified) (4 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-04-06  Leandro Gracia Gil  <leandrogracia@chromium.org>
+
+        Reviewed by Steve Block.
+
+        Make the style of createFunctionOnlyCallback in V8 consistent with the JavaScriptCore version.
+        https://bugs.webkit.org/show_bug.cgi?id=57963
+
+        No new tests. LayoutTests/fast/dom/Geolocation/argument-types.html
+
+        * bindings/v8/V8Utilities.h:
+        (WebCore::createFunctionOnlyCallback):
+        * bindings/v8/custom/V8GeolocationCustom.cpp:
+        (WebCore::V8Geolocation::getCurrentPositionCallback):
+        (WebCore::V8Geolocation::watchPositionCallback):
+
 2011-04-06  Brian Weinstein  <bweinstein@apple.com>
 

trunk/Source/WebCore/bindings/v8/V8Utilities.h

@@ -59 +59 @@
 
     enum CallbackAllowedValueFlag {
-        CallbackAllowFunction = 0,
         CallbackAllowUndefined = 1,
         CallbackAllowNull = 1 << 1
@@ -68 +67 @@
     // 'FunctionOnly' is assumed for the created callback.
     template <typename V8CallbackType>
-    PassRefPtr<V8CallbackType> createFunctionOnlyCallback(v8::Local<v8::Value> value, CallbackAllowedValueFlags acceptedValues, bool& succeeded)
+    PassRefPtr<V8CallbackType> createFunctionOnlyCallback(v8::Local<v8::Value> value, bool& succeeded, CallbackAllowedValueFlags acceptedValues = 0)
     {
         succeeded = true;
 
-        if ((value->IsUndefined() && (acceptedValues & CallbackAllowUndefined))
-            || (value->IsNull() && (acceptedValues & CallbackAllowNull)))
+        if (value->IsUndefined() && (acceptedValues & CallbackAllowUndefined))
+            return 0;
+
+        if (value->IsNull() && (acceptedValues & CallbackAllowNull))
             return 0;
 

trunk/Source/WebCore/bindings/v8/custom/V8GeolocationCustom.cpp

@@ -134 +134 @@
     bool succeeded = false;
 
-    RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8CustomPositionCallback>(args[0], CallbackAllowFunction, succeeded);
+    RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8CustomPositionCallback>(args[0], succeeded);
     if (!succeeded)
         return v8::Undefined();
@@ -140 +140 @@
 
     // Argument is optional (hence undefined is allowed), and null is allowed.
-    RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8CustomPositionErrorCallback>(args[1], CallbackAllowUndefined | CallbackAllowNull, succeeded);
+    RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8CustomPositionErrorCallback>(args[1], succeeded, CallbackAllowUndefined | CallbackAllowNull);
     if (!succeeded)
         return v8::Undefined();
@@ -160 +160 @@
     bool succeeded = false;
 
-    RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8CustomPositionCallback>(args[0], CallbackAllowFunction, succeeded);
+    RefPtr<PositionCallback> positionCallback = createFunctionOnlyCallback<V8CustomPositionCallback>(args[0], succeeded);
     if (!succeeded)
         return v8::Undefined();
@@ -166 +166 @@
 
     // Argument is optional (hence undefined is allowed), and null is allowed.
-    RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8CustomPositionErrorCallback>(args[1], CallbackAllowUndefined | CallbackAllowNull, succeeded);
+    RefPtr<PositionErrorCallback> positionErrorCallback = createFunctionOnlyCallback<V8CustomPositionErrorCallback>(args[1], succeeded, CallbackAllowUndefined | CallbackAllowNull);
     if (!succeeded)
         return v8::Undefined();