Changeset 39769 in webkit for trunk/JavaScriptCore/runtime/JSImmediate.h

Timestamp:

Jan 9, 2009, 4:14:25 PM (16 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2009-01-09 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Stage two of converting JSValue from a pointer to a class type.
Remove the class JSValue. The functionallity has been transitioned
into the wrapper class type JSValuePtr.

The last stage will be to rename JSValuePtr to JSValue, remove the
overloaded -> operator, and switch operations on JSValuePtrs from
using '->' to use '.' instead.

• API/APICast.h:
• JavaScriptCore.exp:
• runtime/JSCell.h: (JSC::asCell): (JSC::JSValuePtr::asCell): (JSC::JSValuePtr::isNumber): (JSC::JSValuePtr::isString): (JSC::JSValuePtr::isGetterSetter): (JSC::JSValuePtr::isObject): (JSC::JSValuePtr::getNumber): (JSC::JSValuePtr::getString): (JSC::JSValuePtr::getObject): (JSC::JSValuePtr::getCallData): (JSC::JSValuePtr::getConstructData): (JSC::JSValuePtr::getUInt32): (JSC::JSValuePtr::getTruncatedInt32): (JSC::JSValuePtr::getTruncatedUInt32): (JSC::JSValuePtr::mark): (JSC::JSValuePtr::marked): (JSC::JSValuePtr::toPrimitive): (JSC::JSValuePtr::getPrimitiveNumber): (JSC::JSValuePtr::toBoolean): (JSC::JSValuePtr::toNumber): (JSC::JSValuePtr::toString): (JSC::JSValuePtr::toObject): (JSC::JSValuePtr::toThisObject): (JSC::JSValuePtr::needsThisConversion): (JSC::JSValuePtr::toThisString): (JSC::JSValuePtr::getJSNumber):
• runtime/JSImmediate.h: (JSC::JSValuePtr::isUndefined): (JSC::JSValuePtr::isNull): (JSC::JSValuePtr::isUndefinedOrNull): (JSC::JSValuePtr::isBoolean): (JSC::JSValuePtr::getBoolean): (JSC::JSValuePtr::toInt32): (JSC::JSValuePtr::toUInt32):
• runtime/JSNumberCell.h: (JSC::JSValuePtr::uncheckedGetNumber): (JSC::JSValuePtr::toJSNumber):
• runtime/JSObject.h: (JSC::JSValuePtr::isObject): (JSC::JSValuePtr::get): (JSC::JSValuePtr::put):
• runtime/JSString.h: (JSC::JSValuePtr::toThisJSString):
• runtime/JSValue.cpp: (JSC::JSValuePtr::toInteger): (JSC::JSValuePtr::toIntegerPreserveNaN): (JSC::JSValuePtr::toInt32SlowCase): (JSC::JSValuePtr::toUInt32SlowCase):
• runtime/JSValue.h: (JSC::JSValuePtr::makeImmediate): (JSC::JSValuePtr::immediateValue): (JSC::JSValuePtr::JSValuePtr): (JSC::JSValuePtr::operator->): (JSC::JSValuePtr::operator bool): (JSC::JSValuePtr::operator==): (JSC::JSValuePtr::operator!=): (JSC::JSValuePtr::encode): (JSC::JSValuePtr::decode): (JSC::JSValuePtr::toFloat): (JSC::JSValuePtr::asValue): (JSC::operator==): (JSC::operator!=):

WebCore:

2009-01-09 Gavin Barraclough <​[email protected]>

Reviewed by Oliver Hunt.

Delete references to JSValue, removing this class.

• bindings/js/JSWorkerContextCustom.cpp: (WebCore::JSWorkerContext::self):
• bindings/js/ScriptCallStack.h:

File:

• trunk/JavaScriptCore/runtime/JSImmediate.h (modified) (6 diffs)

trunk/JavaScriptCore/runtime/JSImmediate.h

@@ -38 +38 @@
     class JSCell;
     class JSObject;
-    class JSValue;
     class UString;
 
@@ -506 +505 @@
     uint32_t toUInt32SlowCase(double, bool& ok);
 
-    inline bool JSValue::isUndefined() const
+    inline bool JSValuePtr::isUndefined() const
     {
         return asValue() == jsUndefined();
     }
 
-    inline bool JSValue::isNull() const
+    inline bool JSValuePtr::isNull() const
     {
         return asValue() == jsNull();
     }
 
-    inline bool JSValue::isUndefinedOrNull() const
+    inline bool JSValuePtr::isUndefinedOrNull() const
     {
         return JSImmediate::isUndefinedOrNull(asValue());
     }
 
-    inline bool JSValue::isBoolean() const
+    inline bool JSValuePtr::isBoolean() const
     {
         return JSImmediate::isBoolean(asValue());
     }
 
-    inline bool JSValue::getBoolean(bool& v) const
+    inline bool JSValuePtr::getBoolean(bool& v) const
     {
         if (JSImmediate::isBoolean(asValue())) {
@@ -536 +535 @@
     }
 
-    inline bool JSValue::getBoolean() const
+    inline bool JSValuePtr::getBoolean() const
     {
         return asValue() == jsBoolean(true);
     }
 
-    ALWAYS_INLINE int32_t JSValue::toInt32(ExecState* exec) const
+    ALWAYS_INLINE int32_t JSValuePtr::toInt32(ExecState* exec) const
     {
         int32_t i;
@@ -550 +549 @@
     }
 
-    inline uint32_t JSValue::toUInt32(ExecState* exec) const
+    inline uint32_t JSValuePtr::toUInt32(ExecState* exec) const
     {
         uint32_t i;
@@ -577 +576 @@
     }
 
-    inline int32_t JSValue::toInt32(ExecState* exec, bool& ok) const
+    inline int32_t JSValuePtr::toInt32(ExecState* exec, bool& ok) const
     {
         int32_t i;
@@ -587 +586 @@
     }
 
-    inline uint32_t JSValue::toUInt32(ExecState* exec, bool& ok) const
+    inline uint32_t JSValuePtr::toUInt32(ExecState* exec, bool& ok) const
     {
         uint32_t i;