Changeset 161861 in webkit for trunk/Source/JavaScriptCore

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):

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSValueRef.cpp (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• bindings/ScriptValue.cpp (modified) (2 diffs)
• inspector/InspectorValues.cpp (modified) (2 diffs)
• runtime/DatePrototype.cpp (modified) (1 diff)
• runtime/Identifier.h (modified) (1 diff)
• runtime/JSStringBuilder.h (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSValueRef.cpp

@@ -324 +324 @@
     String str = string->string();
     unsigned length = str.length();
-    if (str.is8Bit()) {
+    if (length && str.is8Bit()) {
         LiteralParser<LChar> parser(exec, str.characters8(), length, StrictJSON);
         return toRef(exec, parser.tryLiteralParse());
     }
-    LiteralParser<UChar> parser(exec, str.characters16(), length, StrictJSON);
+    LiteralParser<UChar> parser(exec, str.characters(), length, StrictJSON);
     return toRef(exec, parser.tryLiteralParse());
 }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2014-01-12  Commit Queue  <[email protected]>
+
+        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).
+
+        * 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):
+
 2014-01-12  Darin Adler  <[email protected]>
 

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;

trunk/Source/JavaScriptCore/inspector/InspectorValues.cpp

@@ -447 +447 @@
 inline bool escapeChar(UChar c, StringBuilder* dst)
 {
-    // Must escape < and > to prevent script execution.
     switch (c) {
-    case '\b': dst->appendLiteral("\\b"); break;
-    case '\f': dst->appendLiteral("\\f"); break;
-    case '\n': dst->appendLiteral("\\n"); break;
-    case '\r': dst->appendLiteral("\\r"); break;
-    case '\t': dst->appendLiteral("\\t"); break;
-    case '\\': dst->appendLiteral("\\\\"); break;
-    case '"': dst->appendLiteral("\\\""); break;
-    case '<': dst->appendLiteral("\\u003C"); break;
-    case '>': dst->appendLiteral("\\u003E"); break;
+    case '\b': dst->append("\\b", 2); break;
+    case '\f': dst->append("\\f", 2); break;
+    case '\n': dst->append("\\n", 2); break;
+    case '\r': dst->append("\\r", 2); break;
+    case '\t': dst->append("\\t", 2); break;
+    case '\\': dst->append("\\\\", 2); break;
+    case '"': dst->append("\\\"", 2); break;
     default:
         return false;
@@ -470 +467 @@
         UChar c = str[i];
         if (!escapeChar(c, dst)) {
-            // We could format c > 126 as UTF-8 instead of escaping them.
-            if (c >= 32 || c <= 126)
+            if (c < 32 || c > 126 || c == '<' || c == '>') {
+                // 1. Escaping <, > to prevent script execution.
+                // 2. Technically, we could also pass through c > 126 as UTF8, but this
+                //    is also optional.  It would also be a pain to implement here.
+                unsigned int symbol = static_cast<unsigned int>(c);
+                String symbolCode = String::format("\\u%04X", symbol);
+                dst->append(symbolCode.characters(), symbolCode.length());
+            } else
                 dst->append(c);
-            else {
-                // FIXME: Way too slow to do this by creating and destroying a string each time.
-                dst->append(String::format("\\u%04X", static_cast<unsigned>(c)));
-            }
         }
     }

trunk/Source/JavaScriptCore/runtime/DatePrototype.cpp

@@ -163 +163 @@
         timeStyle = styleFromArgString(arg0String, timeStyle);
 
-    RetainPtr<CFDateFormatterRef> formatter = adoptCF(CFDateFormatterCreate(kCFAllocatorDefault, adoptCF(CFLocaleCopyCurrent()).get(), dateStyle, timeStyle));
-
-    if (useCustomFormat)
-        CFDateFormatterSetFormat(formatter.get(), customFormatString.createCFString().get());
-
-    RetainPtr<CFStringRef> string = adoptCF(CFDateFormatterCreateStringWithAbsoluteTime(kCFAllocatorDefault, formatter.get(), floor(timeInMilliseconds / msPerSecond) - kCFAbsoluteTimeIntervalSince1970));
-
-    return jsNontrivialString(exec, string.get());
+    CFLocaleRef locale = CFLocaleCopyCurrent();
+    CFDateFormatterRef formatter = CFDateFormatterCreate(0, locale, dateStyle, timeStyle);
+    CFRelease(locale);
+
+    if (useCustomFormat) {
+        CFStringRef customFormatCFString = CFStringCreateWithCharacters(0, customFormatString.characters(), customFormatString.length());
+        CFDateFormatterSetFormat(formatter, customFormatCFString);
+        CFRelease(customFormatCFString);
+    }
+
+    CFStringRef string = CFDateFormatterCreateStringWithAbsoluteTime(0, formatter, floor(timeInMilliseconds / msPerSecond) - kCFAbsoluteTimeIntervalSince1970);
+
+    CFRelease(formatter);
+
+    // We truncate the string returned from CFDateFormatter if it's absurdly long (> 200 characters).
+    // That's not great error handling, but it just won't happen so it doesn't matter.
+    UChar buffer[200];
+    const size_t bufferLength = WTF_ARRAY_LENGTH(buffer);
+    size_t length = CFStringGetLength(string);
+    ASSERT(length <= bufferLength);
+    if (length > bufferLength)
+        length = bufferLength;
+    CFStringGetCharacters(string, CFRangeMake(0, length), buffer);
+
+    CFRelease(string);
+
+    return jsNontrivialString(exec, String(buffer, length));
 }
 

trunk/Source/JavaScriptCore/runtime/Identifier.h

@@ -56 +56 @@
         StringImpl* impl() const { return m_string.impl(); }
         
+        const UChar* characters() const { return m_string.characters(); }
         int length() const { return m_string.length(); }
         

trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h

@@ -106 +106 @@
             upConvert();
         }
-        m_okay &= buffer16.tryAppend(str.characters16(), length);
+        m_okay &= buffer16.tryAppend(str.characters(), length);
     }