Changeset 161861 in webkit for trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp

Timestamp:

Jan 12, 2014, 10:26:50 PM (11 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r161840.
​http://trac.webkit.org/changeset/161840
​https://bugs.webkit.org/show_bug.cgi?id=126870

Caused jsscore and layout test failures (Requested by smfr on
#webkit).

Source/JavaScriptCore:

• API/JSValueRef.cpp:

(JSValueMakeFromJSONString):

• bindings/ScriptValue.cpp:

(Deprecated::jsToInspectorValue):

• inspector/InspectorValues.cpp:
• runtime/DatePrototype.cpp:

(JSC::formatLocaleDate):

• runtime/Identifier.h:

(JSC::Identifier::characters):

• runtime/JSStringBuilder.h:

(JSC::JSStringBuilder::append):

Source/WebCore:

• bindings/objc/WebScriptObject.mm:

(+[WebScriptObject _convertValueToObjcValue:JSC::originRootObject:rootObject:]):

• editing/CompositeEditCommand.cpp:

(WebCore::containsOnlyWhitespace):

• editing/TypingCommand.cpp:

(WebCore::TypingCommand::insertText):

• editing/VisibleUnits.cpp:

(WebCore::startOfParagraph):
(WebCore::endOfParagraph):

• html/parser/HTMLParserIdioms.cpp:

(WebCore::stripLeadingAndTrailingHTMLSpaces):
(WebCore::parseHTMLNonNegativeInteger):

• inspector/ContentSearchUtils.cpp:

(WebCore::ContentSearchUtils::createSearchRegexSource):

• inspector/InspectorStyleSheet.cpp:

(WebCore::InspectorStyle::newLineAndWhitespaceDelimiters):

• inspector/InspectorStyleTextEditor.cpp:

(WebCore::InspectorStyleTextEditor::insertProperty):
(WebCore::InspectorStyleTextEditor::internalReplaceProperty):

• platform/Length.cpp:

(WebCore::newCoordsArray):

• platform/LinkHash.cpp:

(WebCore::visitedLinkHash):

• platform/graphics/Color.cpp:

(WebCore::Color::parseHexColor):
(WebCore::Color::Color):

• platform/graphics/TextRun.h:

(WebCore::TextRun::TextRun):

• platform/text/TextEncodingRegistry.cpp:

(WebCore::atomicCanonicalTextEncodingName):

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::constructTextRun):

• rendering/RenderCombineText.cpp:

(WebCore::RenderCombineText::width):

• svg/SVGFontElement.cpp:

(WebCore::SVGFontElement::registerLigaturesInGlyphCache):

• xml/XPathFunctions.cpp:

(WebCore::XPath::FunId::evaluate):

• xml/XPathNodeSet.h:

Source/WTF:

• wtf/text/StringImpl.cpp:

(WTF::StringImpl::replace):

• wtf/text/WTFString.h:

(WTF::String::isAllSpecialCharacters):

File:

• trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/bindings/ScriptValue.cpp

@@ -116 +116 @@
     if (value.isNumber())
         return InspectorBasicValue::create(value.asNumber());
-    if (value.isString())
-        return InspectorString::create(value.getString(scriptState));
+    if (value.isString()) {
+        String s = value.getString(scriptState);
+        return InspectorString::create(String(s.characters(), s.length()));
+    }
 
     if (value.isObject()) {
@@ -137 +139 @@
         PropertyNameArray propertyNames(scriptState);
         object->methodTable()->getOwnPropertyNames(object, scriptState, propertyNames, ExcludeDontEnumProperties);
-        for (auto& name : propertyNames) {
-            RefPtr<InspectorValue> inspectorValue = jsToInspectorValue(scriptState, object->get(scriptState, name), maxDepth);
+        for (size_t i = 0; i < propertyNames.size(); i++) {
+            const Identifier& name =  propertyNames[i];
+            JSValue propertyValue = object->get(scriptState, name);
+            RefPtr<InspectorValue> inspectorValue = jsToInspectorValue(scriptState, propertyValue, maxDepth);
             if (!inspectorValue)
                 return nullptr;
-            inspectorObject->setValue(name.string(), inspectorValue);
+            inspectorObject->setValue(String(name.characters(), name.length()), inspectorValue);
         }
         return inspectorObject;