Changeset 447 for trunk/JavaScriptCore/API/JSValueRef.cpp
- Timestamp:
- 08/20/08 13:23:52 (5 months ago)
- Files:
-
- trunk/JavaScriptCore/API/JSValueRef.cpp (modified) (11 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/JavaScriptCore/API/JSValueRef.cpp
r440 r447 32 32 #include "JSCallbackObject.h" 33 33 34 #include <kjs/JSType.h>35 34 #include <kjs/JSGlobalObject.h> 36 35 #include <kjs/JSString.h> … … 47 46 { 48 47 KJS::JSValue* jsValue = toJS(value); 49 switch (jsValue->type()) { 50 case KJS::UndefinedType: 51 return kJSTypeUndefined; 52 case KJS::NullType: 53 return kJSTypeNull; 54 case KJS::BooleanType: 55 return kJSTypeBoolean; 56 case KJS::NumberType: 57 return kJSTypeNumber; 58 case KJS::StringType: 59 return kJSTypeString; 60 case KJS::ObjectType: 61 return kJSTypeObject; 62 default: 63 ASSERT(!"JSValueGetType: unknown type code.\n"); 64 return kJSTypeUndefined; 65 } 48 if (jsValue->isUndefined()) 49 return kJSTypeUndefined; 50 if (jsValue->isNull()) 51 return kJSTypeNull; 52 if (jsValue->isBoolean()) 53 return kJSTypeBoolean; 54 if (jsValue->isNumber()) 55 return kJSTypeNumber; 56 if (jsValue->isString()) 57 return kJSTypeString; 58 ASSERT(jsValue->isObject()); 59 return kJSTypeObject; 66 60 } 67 61 … … 121 115 ExecState* exec = toJS(ctx); 122 116 exec->globalData().heap->registerThread(); 117 JSLock lock(exec); 123 118 124 119 JSValue* jsA = toJS(a); … … 147 142 ExecState* exec = toJS(ctx); 148 143 exec->globalData().heap->registerThread(); 144 JSLock lock(exec); 149 145 150 146 JSValue* jsValue = toJS(value); … … 180 176 ExecState* exec = toJS(ctx); 181 177 exec->globalData().heap->registerThread(); 178 JSLock lock(exec); 182 179 183 180 return toRef(jsNumber(exec, value)); … … 188 185 ExecState* exec = toJS(ctx); 189 186 exec->globalData().heap->registerThread(); 187 JSLock lock(exec); 190 188 191 189 return toRef(jsString(exec, string->ustring())); … … 203 201 ExecState* exec = toJS(ctx); 204 202 exec->globalData().heap->registerThread(); 203 JSLock lock(exec); 205 204 206 205 JSValue* jsValue = toJS(value); … … 220 219 ExecState* exec = toJS(ctx); 221 220 exec->globalData().heap->registerThread(); 221 JSLock lock(exec); 222 222 223 223 JSValue* jsValue = toJS(value); … … 237 237 ExecState* exec = toJS(ctx); 238 238 exec->globalData().heap->registerThread(); 239 JSLock lock(exec); 239 240 240 241 JSValue* jsValue = toJS(value); … … 254 255 ExecState* exec = toJS(ctx); 255 256 exec->globalData().heap->registerThread(); 257 JSLock lock(exec); 256 258 257 259 JSValue* jsValue = toJS(value); … … 263 265 ExecState* exec = toJS(ctx); 264 266 exec->globalData().heap->registerThread(); 267 JSLock lock(exec); 265 268 266 269 JSValue* jsValue = toJS(value);
