Changeset 182297 in webkit for trunk/Source/JavaScriptCore/API/JSValueRef.cpp

Timestamp:

Apr 2, 2015, 5:09:42 PM (10 years ago)

Author:

[email protected]

Message:

JavaScriptCore API should support type checking for Array and Date
​https://bugs.webkit.org/show_bug.cgi?id=143324

Reviewed by Darin Adler, Sam Weinig, Dan Bernstein.

• API/JSValue.h:
• API/JSValue.mm:

(-[JSValue isArray]):
(-[JSValue isDate]): Added an ObjC API.

• API/JSValueRef.cpp:

(JSValueIsArray):
(JSValueIsDate):

• API/JSValueRef.h: Added a C API.

• API/WebKitAvailability.h: Brought our availability macros up to date

and fixed a harmless bug where "10_10" translated to "10.0".

• API/tests/testapi.c:

(main): Added a test and corrected a pre-existing leak.

• API/tests/testapi.mm:

(testObjectiveCAPI): Added a test.

File:

• trunk/Source/JavaScriptCore/API/JSValueRef.cpp (modified) (8 diffs)

trunk/Source/JavaScriptCore/API/JSValueRef.cpp

@@ -28 +28 @@
 
 #include "APICast.h"
+#include "DateInstance.h"
 #include "JSAPIWrapperObject.h"
+#include "JSCInlines.h"
 #include "JSCJSValue.h"
 #include "JSCallbackObject.h"
@@ -35 +37 @@
 #include "JSString.h"
 #include "LiteralParser.h"
-#include "JSCInlines.h"
 #include "Protect.h"
-
+#include <algorithm>
 #include <wtf/Assertions.h>
 #include <wtf/text/StringHash.h>
 #include <wtf/text/WTFString.h>
-
-#include <algorithm> // for std::min
 
 #if PLATFORM(MAC)
@@ -99 +98 @@
     JSLockHolder locker(exec);
 
-    JSValue jsValue = toJS(exec, value);
-    return jsValue.isUndefined();
+    return toJS(exec, value).isUndefined();
 }
 
@@ -112 +110 @@
     JSLockHolder locker(exec);
 
-    JSValue jsValue = toJS(exec, value);
-    return jsValue.isNull();
+    return toJS(exec, value).isNull();
 }
 
@@ -125 +122 @@
     JSLockHolder locker(exec);
 
-    JSValue jsValue = toJS(exec, value);
-    return jsValue.isBoolean();
+    return toJS(exec, value).isBoolean();
 }
 
@@ -138 +134 @@
     JSLockHolder locker(exec);
 
-    JSValue jsValue = toJS(exec, value);
-    return jsValue.isNumber();
+    return toJS(exec, value).isNumber();
 }
 
@@ -151 +146 @@
     JSLockHolder locker(exec);
 
-    JSValue jsValue = toJS(exec, value);
-    return jsValue.isString();
+    return toJS(exec, value).isString();
 }
 
@@ -164 +158 @@
     JSLockHolder locker(exec);
 
-    JSValue jsValue = toJS(exec, value);
-    return jsValue.isObject();
+    return toJS(exec, value).isObject();
+}
+
+bool JSValueIsArray(JSContextRef ctx, JSValueRef value)
+{
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }
+    ExecState* exec = toJS(ctx);
+    JSLockHolder locker(exec);
+
+    return toJS(exec, value).inherits(JSArray::info());
+}
+
+bool JSValueIsDate(JSContextRef ctx, JSValueRef value)
+{
+    if (!ctx) {
+        ASSERT_NOT_REACHED();
+        return false;
+    }
+    ExecState* exec = toJS(ctx);
+    JSLockHolder locker(exec);
+
+    return toJS(exec, value).inherits(DateInstance::info());
 }