Changeset 34921 in webkit for trunk/JavaScriptCore/kjs/JSString.h

Timestamp:

Jul 1, 2008, 10:32:44 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-07-01 Sam Weinig <​[email protected]>

Reviewed by Darin Adler.

Split JSCell and JSNumberCell class declarations out of JSValue.h

• GNUmakefile.am:
• JavaScriptCore.pri:
• JavaScriptCore.vcproj/JavaScriptCore/JavaScriptCore.vcproj:
• JavaScriptCore.xcodeproj/project.pbxproj:
• JavaScriptCoreSources.bkl:
• VM/JSPropertyNameIterator.h:
• kjs/AllInOneFile.cpp:
• kjs/JSCell.cpp: Copied from JavaScriptCore/kjs/JSValue.cpp.
• kjs/JSCell.h: Copied from JavaScriptCore/kjs/JSValue.h. (KJS::JSValue::getJSNumber):
• kjs/JSNumberCell.cpp:
• kjs/JSNumberCell.h: Copied from JavaScriptCore/kjs/JSValue.h.
• kjs/JSObject.h:
• kjs/JSString.cpp: (KJS::jsString): (KJS::jsOwnedString):
• kjs/JSString.h: (KJS::JSValue::toThisJSString):
• kjs/JSValue.cpp:
• kjs/JSValue.h:

WebCore:

2008-07-01 Sam Weinig <​[email protected]>

Reviewed by Darin Adler.

Split JSCell and JSNumberCell class declarations out of JSValue.h

• ForwardingHeaders/kjs/JSNumberCell.h: Added.
• bindings/scripts/CodeGeneratorJS.pm:
• bridge/c/c_instance.cpp:

File:

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

trunk/JavaScriptCore/kjs/JSString.h

@@ -26 +26 @@
 
 #include "CommonIdentifiers.h"
-#include "JSValue.h"
+#include "JSCell.h"
 #include "PropertySlot.h"
 #include "identifier.h"
@@ -69 +69 @@
   };
 
+  JSString* jsString(ExecState*, const UString&); // returns empty string if passed null string
+  JSString* jsString(ExecState*, const char* = ""); // returns empty string if passed 0
+
+  // Should be used for strings that are owned by an object that will
+  // likely outlive the JSValue this makes, such as the parse tree or a
+  // DOM object that contains a UString
+  JSString* jsOwnedString(ExecState*, const UString&); 
+
 ALWAYS_INLINE bool JSString::getStringPropertySlot(ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
 {
@@ -96 +104 @@
 }
 
-} // namespace
+// --- JSValue inlines ----------------------------
+
+inline JSString* JSValue::toThisJSString(ExecState* exec)
+{
+    return JSImmediate::isImmediate(this) ? jsString(exec, JSImmediate::toString(this)) : asCell()->toThisJSString(exec);
+}
+
+} // namespace KJS
 
 #endif // JSString_h