Changeset 160597 in webkit

Timestamp:

Dec 14, 2013 9:53:05 AM (10 years ago)

Author:

commit-queue@webkit.org

Message:

Small string improvements to JSInjectedScriptHost::type and other bindings
​https://bugs.webkit.org/show_bug.cgi?id=125722

Patch by Joseph Pecoraro <Joseph Pecoraro> on 2013-12-14
Reviewed by Timothy Hatcher.

• bindings/js/JSInjectedScriptHostCustom.cpp:

(WebCore::JSInjectedScriptHost::type):
Use SmallStrings, jsNontrivialString and ASCIILiteral.

• bindings/js/JSJavaScriptCallFrameCustom.cpp:

(WebCore::JSJavaScriptCallFrame::type):
Use jsNontrivialString.

• bridge/c/c_instance.cpp:

(JSC::Bindings::CInstance::stringValue):
Use jsNontrivialString and ASCIILiteral.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• bindings/js/JSInjectedScriptHostCustom.cpp (modified) (1 diff)
• bindings/js/JSJavaScriptCallFrameCustom.cpp (modified) (1 diff)
• bridge/c/c_instance.cpp (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-12-14  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Small string improvements to JSInjectedScriptHost::type and other bindings
+        https://bugs.webkit.org/show_bug.cgi?id=125722
+
+        Reviewed by Timothy Hatcher.
+
+        * bindings/js/JSInjectedScriptHostCustom.cpp:
+        (WebCore::JSInjectedScriptHost::type):
+        Use SmallStrings, jsNontrivialString and ASCIILiteral.
+
+        * bindings/js/JSJavaScriptCallFrameCustom.cpp:
+        (WebCore::JSJavaScriptCallFrame::type):
+        Use jsNontrivialString.
+
+        * bridge/c/c_instance.cpp:
+        (JSC::Bindings::CInstance::stringValue):
+        Use jsNontrivialString and ASCIILiteral.
+
 2013-12-14  Andreas Kling  <akling@apple.com>
 

trunk/Source/WebCore/bindings/js/JSInjectedScriptHostCustom.cpp

@@ -129 +129 @@
     JSValue value = exec->uncheckedArgument(0);
     if (value.isString())
-        return jsString(exec, String("string"));
+        return exec->vm().smallStrings.stringString();
     if (value.inherits(JSArray::info()))
-        return jsString(exec, String("array"));
+        return jsNontrivialString(exec, ASCIILiteral("array"));
     if (value.isBoolean())
-        return jsString(exec, String("boolean"));
+        return exec->vm().smallStrings.booleanString();
     if (value.isNumber())
-        return jsString(exec, String("number"));
+        return exec->vm().smallStrings.numberString();
     if (value.inherits(DateInstance::info()))
-        return jsString(exec, String("date"));
+        return jsNontrivialString(exec, ASCIILiteral("date"));
     if (value.inherits(RegExpObject::info()))
-        return jsString(exec, String("regexp"));
+        return jsNontrivialString(exec, ASCIILiteral("regexp"));
     if (value.inherits(JSNode::info()))
-        return jsString(exec, String("node"));
+        return jsNontrivialString(exec, ASCIILiteral("node"));
     if (value.inherits(JSNodeList::info()))
-        return jsString(exec, String("array"));
+        return jsNontrivialString(exec, ASCIILiteral("array"));
     if (value.inherits(JSHTMLCollection::info()))
-        return jsString(exec, String("array"));
+        return jsNontrivialString(exec, ASCIILiteral("array"));
     if (value.inherits(JSInt8Array::info()) || value.inherits(JSInt16Array::info()) || value.inherits(JSInt32Array::info()))
-        return jsString(exec, String("array"));
+        return jsNontrivialString(exec, ASCIILiteral("array"));
     if (value.inherits(JSUint8Array::info()) || value.inherits(JSUint16Array::info()) || value.inherits(JSUint32Array::info()))
-        return jsString(exec, String("array"));
+        return jsNontrivialString(exec, ASCIILiteral("array"));
     if (value.inherits(JSFloat32Array::info()) || value.inherits(JSFloat64Array::info()))
-        return jsString(exec, String("array"));
+        return jsNontrivialString(exec, ASCIILiteral("array"));
+
     return jsUndefined();
 }

trunk/Source/WebCore/bindings/js/JSJavaScriptCallFrameCustom.cpp

@@ -57 +57 @@
 {
     switch (impl().type()) {
-        case DebuggerCallFrame::FunctionType:
-            return jsString(exec, ASCIILiteral("function"));
-        case DebuggerCallFrame::ProgramType:
-            return jsString(exec, ASCIILiteral("program"));
+    case DebuggerCallFrame::FunctionType:
+        return jsNontrivialString(exec, ASCIILiteral("function"));
+    case DebuggerCallFrame::ProgramType:
+        return jsNontrivialString(exec, ASCIILiteral("program"));
     }
 

trunk/Source/WebCore/bridge/c/c_instance.cpp

@@ -284 +284 @@
 
     // Fallback to default implementation.
-    return jsString(exec, "NPObject");
+    return jsNontrivialString(exec, ASCIILiteral("NPObject"));
 }