Changeset 46598 in webkit for trunk/JavaScriptCore/runtime/JSString.h

Timestamp:

Jul 30, 2009, 1:57:44 PM (16 years ago)

Author:

[email protected]

Message:

Merged nitro-extreme branch into trunk.

File:

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

trunk/JavaScriptCore/runtime/JSString.h

@@ -24 +24 @@
 #define JSString_h
 
+#include "CallFrame.h"
 #include "CommonIdentifiers.h"
-#include "CallFrame.h"
 #include "Identifier.h"
 #include "JSNumberCell.h"
@@ -209 +209 @@
     inline JSString* JSValue::toThisJSString(ExecState* exec)
     {
-        return JSImmediate::isImmediate(asValue()) ? jsString(exec, JSImmediate::toString(asValue())) : asCell()->toThisJSString(exec);
+        return isCell() ? asCell()->toThisJSString(exec) : jsString(exec, toString(exec));
     }