Changeset 21736 in webkit

Timestamp:

May 24, 2007 4:28:28 PM (17 years ago)

Author:

weinig

Message:

Reviewed by Darin

Patch for ​http://bugs.webkit.org/show_bug.cgi?id=13855
Port patch 666176 to JavaScriptCore

• Renamed JSValue::downcast() to JSValue::asCell() which makes the function meaning cleaner. It's modeled after Harri Porten change in KDE trunk.

• kjs/collector.cpp: (KJS::Collector::protect): (KJS::Collector::unprotect): (KJS::Collector::collectOnMainThreadOnly):
• kjs/object.h: (KJS::JSValue::isObject):
• kjs/string_object.cpp: (KJS::StringProtoFunc::callAsFunction):
• kjs/value.h: (KJS::JSValue::asCell): (KJS::JSValue::isNumber): (KJS::JSValue::isString): (KJS::JSValue::isObject): (KJS::JSValue::getNumber): (KJS::JSValue::getString): (KJS::JSValue::getObject): (KJS::JSValue::getUInt32): (KJS::JSValue::mark): (KJS::JSValue::marked): (KJS::JSValue::type): (KJS::JSValue::toPrimitive): (KJS::JSValue::toBoolean): (KJS::JSValue::toNumber): (KJS::JSValue::toString): (KJS::JSValue::toObject):

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/collector.cpp (modified) (3 diffs)
• kjs/object.h (modified) (1 diff)
• kjs/string_object.cpp (modified) (1 diff)
• kjs/value.h (modified) (8 diffs)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-05-24  Luciano Montanaro  <mikelima@cirulla.net>
+
+        Reviewed by Darin
+
+        Patch for http://bugs.webkit.org/show_bug.cgi?id=13855
+        Port patch 666176 to JavaScriptCore
+
+        - Renamed JSValue::downcast() to JSValue::asCell() which makes the
+        function meaning cleaner. It's modeled after Harri Porten change in 
+        KDE trunk.
+
+        * kjs/collector.cpp:
+        (KJS::Collector::protect):
+        (KJS::Collector::unprotect):
+        (KJS::Collector::collectOnMainThreadOnly):
+        * kjs/object.h:
+        (KJS::JSValue::isObject):
+        * kjs/string_object.cpp:
+        (KJS::StringProtoFunc::callAsFunction):
+        * kjs/value.h:
+        (KJS::JSValue::asCell):
+        (KJS::JSValue::isNumber):
+        (KJS::JSValue::isString):
+        (KJS::JSValue::isObject):
+        (KJS::JSValue::getNumber):
+        (KJS::JSValue::getString):
+        (KJS::JSValue::getObject):
+        (KJS::JSValue::getUInt32):
+        (KJS::JSValue::mark):
+        (KJS::JSValue::marked):
+        (KJS::JSValue::type):
+        (KJS::JSValue::toPrimitive):
+        (KJS::JSValue::toBoolean):
+        (KJS::JSValue::toNumber):
+        (KJS::JSValue::toString):
+        (KJS::JSValue::toObject):
+
 2007-05-18  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/JavaScriptCore/kjs/collector.cpp

@@ -631 +631 @@
       return;
 
-    protectedValues().add(k->downcast());
+    protectedValues().add(k->asCell());
 }
 
@@ -643 +643 @@
       return;
 
-    protectedValues().remove(k->downcast());
+    protectedValues().remove(k->asCell());
 }
 
@@ -655 +655 @@
       return;
 
-    JSCell* cell = value->downcast();
+    JSCell* cell = value->asCell();
     cellBlock(cell)->collectOnMainThreadOnly.set(cellOffset(cell));
     ++mainThreadOnlyObjectCount;

trunk/JavaScriptCore/kjs/object.h

@@ -543 +543 @@
 inline bool JSValue::isObject(const ClassInfo *c) const
 {
-    return !JSImmediate::isImmediate(this) && downcast()->isObject(c);
+    return !JSImmediate::isImmediate(this) && asCell()->isObject(c);
 }
 

trunk/JavaScriptCore/kjs/string_object.cpp

@@ -552 +552 @@
           // Null instead of an empty array, because this matches
           // other browsers and because Null is a false value.
-          result = jsNull(); 
+          result = jsNull();
         } else {
           result = exec->lexicalInterpreter()->builtinArray()->construct(exec, list);

trunk/JavaScriptCore/kjs/value.h

@@ -57 +57 @@
 class JSValue {
     friend class JSCell; // so it can derive from this class
-    friend class Collector; // so it can call downcast()
+    friend class Collector; // so it can call asCell()
 
 private:
@@ -109 +109 @@
 private:
     // Implementation details.
-    JSCell *downcast();
-    const JSCell *downcast() const;
+    JSCell *asCell();
+    const JSCell *asCell() const;
 
     // Give a compile time error if we try to copy one of these.
@@ -234 +234 @@
 }
 
-inline JSCell *JSValue::downcast()
+inline JSCell *JSValue::asCell()
 {
     ASSERT(!JSImmediate::isImmediate(this));
@@ -240 +240 @@
 }
 
-inline const JSCell *JSValue::downcast() const
+inline const JSCell *JSValue::asCell() const
 {
     ASSERT(!JSImmediate::isImmediate(this));
@@ -268 +268 @@
 inline bool JSValue::isNumber() const
 {
-    return JSImmediate::isNumber(this) || !JSImmediate::isImmediate(this) && downcast()->isNumber();
+    return JSImmediate::isNumber(this) || !JSImmediate::isImmediate(this) && asCell()->isNumber();
 }
 
 inline bool JSValue::isString() const
 {
-    return !JSImmediate::isImmediate(this) && downcast()->isString();
+    return !JSImmediate::isImmediate(this) && asCell()->isString();
 }
 
 inline bool JSValue::isObject() const
 {
-    return !JSImmediate::isImmediate(this) && downcast()->isObject();
+    return !JSImmediate::isImmediate(this) && asCell()->isObject();
 }
 
@@ -302 +302 @@
         return true;
     }
-    return downcast()->getNumber(v);
+    return asCell()->getNumber(v);
 }
 
 inline double JSValue::getNumber() const
 {
-    return JSImmediate::isImmediate(this) ? JSImmediate::toDouble(this) : downcast()->getNumber();
+    return JSImmediate::isImmediate(this) ? JSImmediate::toDouble(this) : asCell()->getNumber();
 }
 
 inline bool JSValue::getString(UString& s) const
 {
-    return !JSImmediate::isImmediate(this) && downcast()->getString(s);
+    return !JSImmediate::isImmediate(this) && asCell()->getString(s);
 }
 
 inline UString JSValue::getString() const
 {
-    return JSImmediate::isImmediate(this) ? UString() : downcast()->getString();
+    return JSImmediate::isImmediate(this) ? UString() : asCell()->getString();
 }
 
 inline JSObject *JSValue::getObject()
 {
-    return JSImmediate::isImmediate(this) ? 0 : downcast()->getObject();
+    return JSImmediate::isImmediate(this) ? 0 : asCell()->getObject();
 }
 
 inline const JSObject *JSValue::getObject() const
 {
-    return JSImmediate::isImmediate(this) ? 0 : downcast()->getObject();
+    return JSImmediate::isImmediate(this) ? 0 : asCell()->getObject();
 }
 
@@ -339 +339 @@
         return JSImmediate::isNumber(this);
     }
-    return downcast()->getUInt32(v);
+    return asCell()->getUInt32(v);
 }
 
@@ -345 +345 @@
 {
     ASSERT(!JSImmediate::isImmediate(this)); // callers should check !marked() before calling mark()
-    downcast()->mark();
+    asCell()->mark();
 }
 
 inline bool JSValue::marked() const
 {
-    return JSImmediate::isImmediate(this) || downcast()->marked();
+    return JSImmediate::isImmediate(this) || asCell()->marked();
 }
 
 inline JSType JSValue::type() const
 {
-    return JSImmediate::isImmediate(this) ? JSImmediate::type(this) : downcast()->type();
+    return JSImmediate::isImmediate(this) ? JSImmediate::type(this) : asCell()->type();
 }
 
 inline JSValue *JSValue::toPrimitive(ExecState *exec, JSType preferredType) const
 {
-    return JSImmediate::isImmediate(this) ? const_cast<JSValue *>(this) : downcast()->toPrimitive(exec, preferredType);
+    return JSImmediate::isImmediate(this) ? const_cast<JSValue *>(this) : asCell()->toPrimitive(exec, preferredType);
 }
 
 inline bool JSValue::toBoolean(ExecState *exec) const
 {
-    return JSImmediate::isImmediate(this) ? JSImmediate::toBoolean(this) : downcast()->toBoolean(exec);
+    return JSImmediate::isImmediate(this) ? JSImmediate::toBoolean(this) : asCell()->toBoolean(exec);
 }
 
 inline double JSValue::toNumber(ExecState *exec) const
 {
-    return JSImmediate::isImmediate(this) ? JSImmediate::toDouble(this) : downcast()->toNumber(exec);
+    return JSImmediate::isImmediate(this) ? JSImmediate::toDouble(this) : asCell()->toNumber(exec);
 }
 
 inline UString JSValue::toString(ExecState *exec) const
 {
-    return JSImmediate::isImmediate(this) ? JSImmediate::toString(this) : downcast()->toString(exec);
+    return JSImmediate::isImmediate(this) ? JSImmediate::toString(this) : asCell()->toString(exec);
 }
 
 inline JSObject* JSValue::toObject(ExecState* exec) const
 {
-    return JSImmediate::isImmediate(this) ? JSImmediate::toObject(this, exec) : downcast()->toObject(exec);
+    return JSImmediate::isImmediate(this) ? JSImmediate::toObject(this, exec) : asCell()->toObject(exec);
 }