Changeset 95229 in webkit for trunk/Source/JavaScriptCore/runtime/JSString.h

Timestamp:

Sep 15, 2011, 2:24:09 PM (14 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r95167.
​http://trac.webkit.org/changeset/95167
​https://bugs.webkit.org/show_bug.cgi?id=68191

Patch needs further work. (Requested by mhahnenberg on
#webkit).

Patch by Sheriff Bot <​[email protected]> on 2011-09-15

• JavaScriptCore.exp:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.def:
• runtime/JSCell.cpp:

(JSC::JSCell::toBoolean):

• runtime/JSCell.h:

(JSC::JSCell::JSValue::toBoolean):

• runtime/JSNotAnObject.cpp:

(JSC::JSNotAnObject::toBoolean):

• runtime/JSNotAnObject.h:
• runtime/JSObject.h:
• runtime/JSString.h:
• runtime/StringObjectThatMasqueradesAsUndefined.h:

(JSC::StringObjectThatMasqueradesAsUndefined::toBoolean):

File:

• trunk/Source/JavaScriptCore/runtime/JSString.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -63 +63 @@
     public:
         friend class JIT;
-        friend class JSCell;
         friend class JSGlobalData;
-        friend class JSValue;
         friend class SpecializedThunkJIT;
         friend struct ThunkHelpers;
@@ -497 +495 @@
         virtual JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue& value);
-        bool toBoolean(ExecState*) const;
+        virtual bool toBoolean(ExecState*) const;
         virtual double toNumber(ExecState*) const;
         virtual JSObject* toObject(ExecState*, JSGlobalObject*) const;
@@ -683 +681 @@
     inline bool isJSString(JSGlobalData* globalData, JSValue v) { return v.isCell() && v.asCell()->vptr() == globalData->jsStringVPtr; }
 
-    inline bool JSCell::toBoolean(ExecState* exec) const
-    {
-        if (isString()) 
-            return static_cast<const JSString*>(this)->toBoolean(exec);
-        return !structure()->typeInfo().masqueradesAsUndefined();
-    }
-
     // --- JSValue inlines ----------------------------
-    
-    inline bool JSValue::toBoolean(ExecState* exec) const
-    {
-        if (isInt32())
-            return asInt32();
-        if (isDouble())
-            return asDouble() > 0.0 || asDouble() < 0.0; // false for NaN
-        if (isCell())
-            return asCell()->toBoolean(exec);
-        return isTrue(); // false, null, and undefined all convert to false.
-    }
 
     inline UString JSValue::toString(ExecState* exec) const