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

Timestamp:

Sep 19, 2011, 2:28:06 PM (14 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r95466.
​http://trac.webkit.org/changeset/95466
​https://bugs.webkit.org/show_bug.cgi?id=68389

Incorrect version of the patch. (Requested by mhahnenberg on
#webkit).

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

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

(JSC::JSCell::toPrimitive):

• runtime/JSCell.h:

(JSC::JSCell::JSValue::toPrimitive):

• runtime/JSNotAnObject.cpp:

(JSC::JSNotAnObject::toPrimitive):

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

File:

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

trunk/Source/JavaScriptCore/runtime/JSString.h

@@ -427 +427 @@
         unsigned length() { return m_length; }
 
-        JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
         bool getStringPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
         bool getStringPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
@@ -494 +493 @@
         }
 
+        virtual JSValue toPrimitive(ExecState*, PreferredPrimitiveType) const;
         virtual bool getPrimitiveNumber(ExecState*, double& number, JSValue& value);
         virtual bool toBoolean(ExecState*) const;
@@ -682 +682 @@
 
     // --- JSValue inlines ----------------------------
-
-    inline JSValue JSValue::toPrimitive(ExecState* exec, PreferredPrimitiveType preferredType) const
-    {
-        if (!isCell())
-            return asValue();
-        return asCell()->toPrimitive(exec, preferredType);
-    }
 
     inline UString JSValue::toString(ExecState* exec) const