summaryrefslogtreecommitdiff
path: root/Source/JavaScriptCore/runtime/Operations.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-05-07 11:21:11 +0200
commit2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47 (patch)
tree988e8c5b116dd0466244ae2fe5af8ee9be926d76 /Source/JavaScriptCore/runtime/Operations.cpp
parentdd91e772430dc294e3bf478c119ef8d43c0a3358 (diff)
downloadqtwebkit-2cf6c8816a73e0132bd8fa3b509d62d7c51b6e47.tar.gz
Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)
Diffstat (limited to 'Source/JavaScriptCore/runtime/Operations.cpp')
-rw-r--r--Source/JavaScriptCore/runtime/Operations.cpp15
1 files changed, 8 insertions, 7 deletions
diff --git a/Source/JavaScriptCore/runtime/Operations.cpp b/Source/JavaScriptCore/runtime/Operations.cpp
index 459feb466..4cb9de505 100644
--- a/Source/JavaScriptCore/runtime/Operations.cpp
+++ b/Source/JavaScriptCore/runtime/Operations.cpp
@@ -58,25 +58,26 @@ NEVER_INLINE JSValue jsAddSlowCase(CallFrame* callFrame, JSValue v1, JSValue v2)
JSValue jsTypeStringForValue(CallFrame* callFrame, JSValue v)
{
+ JSGlobalData& globalData = callFrame->globalData();
if (v.isUndefined())
- return jsNontrivialString(callFrame, "undefined");
+ return globalData.smallStrings.undefinedString(&globalData);
if (v.isBoolean())
- return jsNontrivialString(callFrame, "boolean");
+ return globalData.smallStrings.booleanString(&globalData);
if (v.isNumber())
- return jsNontrivialString(callFrame, "number");
+ return globalData.smallStrings.numberString(&globalData);
if (v.isString())
- return jsNontrivialString(callFrame, "string");
+ return globalData.smallStrings.stringString(&globalData);
if (v.isObject()) {
// Return "undefined" for objects that should be treated
// as null when doing comparisons.
if (asObject(v)->structure()->typeInfo().masqueradesAsUndefined())
- return jsNontrivialString(callFrame, "undefined");
+ return globalData.smallStrings.undefinedString(&globalData);
CallData callData;
JSObject* object = asObject(v);
if (object->methodTable()->getCallData(object, callData) != CallTypeNone)
- return jsNontrivialString(callFrame, "function");
+ return globalData.smallStrings.functionString(&globalData);
}
- return jsNontrivialString(callFrame, "object");
+ return globalData.smallStrings.objectString(&globalData);
}
bool jsIsObjectType(JSValue v)