Changeset 278669 in webkit

Timestamp:

Jun 9, 2021, 1:46:24 PM (5 years ago)

Author:

Chris Dumez

Message:

Avoid some calls to StringView::toString() / StringView::toStringWithoutCopying()
​https://bugs.webkit.org/show_bug.cgi?id=226803

Reviewed by Darin Adler.

Source/WebCore:

• css/parser/CSSPropertyParser.cpp:

(WebCore::consumeFontVariationTag):

• page/FrameView.cpp:

(WebCore::FrameView::scrollToFragmentInternal):

• platform/text/hyphen/HyphenationLibHyphen.cpp:

(WebCore::lastHyphenLocation):

• rendering/RenderTreeAsText.cpp:

(WebCore::writeDebugInfo):

Source/WTF:

Add support to TextStream for printing a StringView directly, without having to convert
it to a String first.

• wtf/text/TextStream.cpp:

(WTF::TextStream::operator<<):

• wtf/text/TextStream.h:

Location:

trunk/Source

Files:

• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/URL.cpp (modified) (6 diffs)
• WTF/wtf/URLParser.cpp (modified) (1 diff)
• WTF/wtf/URLParser.h (modified) (1 diff)
• WTF/wtf/text/StringView.cpp (modified) (1 diff)
• WTF/wtf/text/StringView.h (modified) (1 diff)
• WTF/wtf/text/TextStream.cpp (modified) (1 diff)
• WTF/wtf/text/TextStream.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/Modules/cache/DOMCacheEngine.cpp (modified) (1 diff)
• WebCore/Modules/fetch/FetchBodyConsumer.cpp (modified) (1 diff)
• WebCore/accessibility/AccessibilityRenderObject.cpp (modified) (1 diff)
• WebCore/css/parser/CSSPropertyParser.cpp (modified) (9 diffs)
• WebCore/css/parser/CSSPropertyParserHelpers.cpp (modified) (3 diffs)
• WebCore/dom/ScriptElement.cpp (modified) (2 diffs)
• WebCore/dom/StyledElement.cpp (modified) (1 diff)
• WebCore/dom/TreeScope.cpp (modified) (1 diff)
• WebCore/dom/TreeScope.h (modified) (1 diff)
• WebCore/editing/cocoa/DataDetection.mm (modified) (1 diff)
• WebCore/page/FrameView.cpp (modified) (2 diffs)
• WebCore/page/FrameView.h (modified) (1 diff)
• WebCore/page/SecurityOrigin.cpp (modified) (1 diff)
• WebCore/page/csp/ContentSecurityPolicy.cpp (modified) (3 diffs)
• WebCore/page/csp/ContentSecurityPolicy.h (modified) (2 diffs)
• WebCore/platform/LegacySchemeRegistry.cpp (modified) (1 diff)
• WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp (modified) (1 diff)
• WebCore/platform/network/ParsedContentType.cpp (modified) (1 diff)
• WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp (modified) (1 diff)
• WebCore/rendering/RenderTreeAsText.cpp (modified) (1 diff)
• WebCore/svg/SVGSVGElement.cpp (modified) (4 diffs)
• WebCore/svg/SVGSVGElement.h (modified) (2 diffs)
• WebCore/svg/SVGViewSpec.cpp (modified) (1 diff)
• WebCore/svg/SVGViewSpec.h (modified) (1 diff)
• WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm (modified) (2 diffs)

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2021-06-09  Chris Dumez  <cdumez@apple.com>
+
+        Avoid some calls to StringView::toString() / StringView::toStringWithoutCopying()
+        https://bugs.webkit.org/show_bug.cgi?id=226803
+
+        Reviewed by Darin Adler.
+
+        Add support to TextStream for printing a StringView directly, without having to convert
+        it to a String first.
+
+        * wtf/text/TextStream.cpp:
+        (WTF::TextStream::operator<<):
+        * wtf/text/TextStream.h:
+
 2021-06-09  Alicia Boya García  <aboya@igalia.com>
 

trunk/Source/WTF/wtf/URL.cpp

@@ -379 +379 @@
     // Firefox and IE remove everything after the first ':'.
     auto newProtocolPrefix = newProtocol.substring(0, newProtocol.find(':'));
-    auto newProtocolCanonicalized = URLParser::maybeCanonicalizeScheme(newProtocolPrefix.toStringWithoutCopying());
+    auto newProtocolCanonicalized = URLParser::maybeCanonicalizeScheme(newProtocolPrefix);
     if (!newProtocolCanonicalized)
         return false;
@@ -530 +530 @@
 }
 
-static String percentEncodeCharacters(const String& input, bool(*shouldEncode)(UChar))
-{
-    auto encode = [shouldEncode] (const String& input) {
+template<typename StringType>
+static String percentEncodeCharacters(const StringType& input, bool(*shouldEncode)(UChar))
+{
+    auto encode = [shouldEncode] (const StringType& input) {
         CString utf8 = input.utf8();
         auto* data = utf8.data();
@@ -553 +554 @@
             return encode(input);
     }
-    return input;
+    if constexpr (std::is_same_v<StringType, StringView>)
+        return input.toString();
+    else
+        return input;
 }
 
@@ -585 +589 @@
             StringView(m_string).left(m_userStart),
             slashSlashNeeded ? "//" : "",
-            percentEncodeCharacters(newUser.toStringWithoutCopying(), URLParser::isInUserInfoEncodeSet),
+            percentEncodeCharacters(newUser, URLParser::isInUserInfoEncodeSet),
             needSeparator ? "@" : "",
             StringView(m_string).substring(end)
@@ -607 +611 @@
             StringView(m_string).left(m_userEnd),
             needLeadingSlashes ? "//:" : ":",
-            percentEncodeCharacters(newPassword.toStringWithoutCopying(), URLParser::isInUserInfoEncodeSet),
+            percentEncodeCharacters(newPassword, URLParser::isInUserInfoEncodeSet),
             '@',
             StringView(m_string).substring(credentialsEnd())
@@ -671 +675 @@
         return character == '?' || character == '#' || !isASCII(character);
     };
-    return percentEncodeCharacters(path.toStringWithoutCopying(), questionMarkOrNumberSignOrNonASCII);
+    return percentEncodeCharacters(path, questionMarkOrNumberSignOrNonASCII);
 }
 

trunk/Source/WTF/wtf/URLParser.cpp

@@ -699 +699 @@
 }
 
-std::optional<String> URLParser::maybeCanonicalizeScheme(const String& scheme)
+std::optional<String> URLParser::maybeCanonicalizeScheme(StringView scheme)
 {
     if (scheme.isEmpty())

trunk/Source/WTF/wtf/URLParser.h

@@ -47 +47 @@
 
     WTF_EXPORT_PRIVATE static bool isSpecialScheme(const String& scheme);
-    WTF_EXPORT_PRIVATE static std::optional<String> maybeCanonicalizeScheme(const String& scheme);
+    WTF_EXPORT_PRIVATE static std::optional<String> maybeCanonicalizeScheme(StringView scheme);
 
     static const UIDNA& internationalDomainNameTranscoder();

trunk/Source/WTF/wtf/text/StringView.cpp

@@ -246 +246 @@
         return convertASCIICase<ASCIICase::Upper>(static_cast<const LChar*>(m_characters), m_length);
     return convertASCIICase<ASCIICase::Upper>(static_cast<const UChar*>(m_characters), m_length);
+}
+
+template<typename CharacterType>
+static AtomString convertASCIILowercaseAtom(const CharacterType* input, unsigned length)
+{
+    for (unsigned i = 0; i < length; ++i) {
+        if (UNLIKELY(isASCIIUpper(input[i]))) {
+            CharacterType* characters;
+            auto result = String::createUninitialized(length, characters);
+            StringImpl::copyCharacters(characters, input, i);
+            for (; i < length; ++i)
+                characters[i] = toASCIILower(input[i]);
+            return result;
+        }
+    }
+    // Fast path when the StringView is already all lowercase.
+    return AtomString(input, length);
+}
+
+AtomString StringView::convertToASCIILowercaseAtom() const
+{
+    if (m_is8Bit)
+        return convertASCIILowercaseAtom(characters8(), m_length);
+    return convertASCIILowercaseAtom(characters16(), m_length);
 }
 

trunk/Source/WTF/wtf/text/StringView.h

@@ -149 +149 @@
     WTF_EXPORT_PRIVATE String convertToASCIILowercase() const;
     WTF_EXPORT_PRIVATE String convertToASCIIUppercase() const;
+    WTF_EXPORT_PRIVATE AtomString convertToASCIILowercaseAtom() const;
 
     bool contains(UChar) const;

trunk/Source/WTF/wtf/text/TextStream.cpp

@@ -119 +119 @@
 }
 
+TextStream& TextStream::operator<<(const AtomString& string)
+{
+    m_text.append(string);
+    return *this;
+}
+
 TextStream& TextStream::operator<<(const String& string)
+{
+    m_text.append(string);
+    return *this;
+}
+
+TextStream& TextStream::operator<<(StringView string)
 {
     m_text.append(string);

trunk/Source/WTF/wtf/text/TextStream.h

@@ -71 +71 @@
     WTF_EXPORT_PRIVATE TextStream& operator<<(const char*);
     WTF_EXPORT_PRIVATE TextStream& operator<<(const void*);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(const AtomString&);
     WTF_EXPORT_PRIVATE TextStream& operator<<(const String&);
+    WTF_EXPORT_PRIVATE TextStream& operator<<(StringView);
     // Deprecated. Use the NumberRespectingIntegers FormattingFlag instead.
     WTF_EXPORT_PRIVATE TextStream& operator<<(const FormatNumberRespectingIntegers&);

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-09  Chris Dumez  <cdumez@apple.com>
+
+        Avoid some calls to StringView::toString() / StringView::toStringWithoutCopying()
+        https://bugs.webkit.org/show_bug.cgi?id=226803
+
+        Reviewed by Darin Adler.
+
+        * css/parser/CSSPropertyParser.cpp:
+        (WebCore::consumeFontVariationTag):
+        * page/FrameView.cpp:
+        (WebCore::FrameView::scrollToFragmentInternal):
+        * platform/text/hyphen/HyphenationLibHyphen.cpp:
+        (WebCore::lastHyphenLocation):
+        * rendering/RenderTreeAsText.cpp:
+        (WebCore::writeDebugInfo):
+
 2021-06-09  Tyler Wilcock  <twilco.o@protonmail.com>
 

trunk/Source/WebCore/Modules/cache/DOMCacheEngine.cpp

@@ -100 +100 @@
             return;
         }
-        auto name = nameView.toString();
+        auto name = nameView.toStringWithoutCopying();
         isVarying = cachedRequest.httpHeaderField(name) != request.httpHeaderField(name);
     });

trunk/Source/WebCore/Modules/fetch/FetchBodyConsumer.cpp

@@ -99 +99 @@
             && isValidHTTPToken(parameterName)
             && parameterValue.isAllSpecialCharacters<isHTTPQuotedStringTokenCodePoint>()) {
-            String nameString = parameterName.toString();
-            if (!parameters.contains(nameString))
-                parameters.set(nameString, parameterValue.toString());
+            parameters.ensure(parameterName.toString(), [&] { return parameterValue.toString(); });
         }
     }

trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp

@@ -1005 +1005 @@
         return nullptr;
 
-    auto linkedNode = m_renderer->document().findAnchor(fragmentIdentifier.toStringWithoutCopying());
+    auto linkedNode = m_renderer->document().findAnchor(fragmentIdentifier);
     if (!linkedNode)
         return nullptr;

trunk/Source/WebCore/css/parser/CSSPropertyParser.cpp

@@ -537 +537 @@
         return nullptr;
     
-    auto string = range.consumeIncludingWhitespace().value().toString();
+    auto string = range.consumeIncludingWhitespace().value();
     
     FontTag tag;
@@ -2304 +2304 @@
     
     CSSParserToken token = args.consumeIncludingWhitespace();
-    auto attrName = token.value().toAtomString();
+    AtomString attrName;
     if (context.isHTMLDocument)
-        attrName = attrName.convertToASCIILowercase();
+        attrName = token.value().convertToASCIILowercaseAtom();
+    else
+        attrName = token.value().toAtomString();
 
     if (!args.atEnd())
@@ -3330 +3332 @@
 }
 
-static Vector<String> parseGridTemplateAreasColumnNames(const String& gridRowNames)
+static Vector<String> parseGridTemplateAreasColumnNames(StringView gridRowNames)
 {
     ASSERT(!gridRowNames.isEmpty());
     Vector<String> columnNames;
-    // Using StringImpl to avoid checks and indirection in every call to String::operator[].
-    StringImpl& text = *gridRowNames.impl();
-
     StringBuilder areaName;
-    for (unsigned i = 0; i < text.length(); ++i) {
-        if (isCSSSpace(text[i])) {
+    for (auto character : gridRowNames.codeUnits()) {
+        if (isCSSSpace(character)) {
             if (!areaName.isEmpty()) {
                 columnNames.append(areaName.toString());
@@ -3346 +3345 @@
             continue;
         }
-        if (text[i] == '.') {
+        if (character == '.') {
             if (areaName == ".")
                 continue;
@@ -3354 +3353 @@
             }
         } else {
-            if (!isNameCodePoint(text[i]))
+            if (!isNameCodePoint(character))
                 return Vector<String>();
             if (areaName == ".") {
@@ -3362 +3361 @@
         }
 
-        areaName.append(text[i]);
+        areaName.append(character);
     }
 
@@ -3371 +3370 @@
 }
 
-static bool parseGridTemplateAreasRow(const String& gridRowNames, NamedGridAreaMap& gridAreaMap, const size_t rowCount, size_t& columnCount)
+static bool parseGridTemplateAreasRow(StringView gridRowNames, NamedGridAreaMap& gridAreaMap, const size_t rowCount, size_t& columnCount)
 {
     if (gridRowNames.isAllSpecialCharacters<isCSSSpace>())
@@ -3596 +3595 @@
 
     while (range.peek().type() == StringToken) {
-        if (!parseGridTemplateAreasRow(range.consumeIncludingWhitespace().value().toString(), gridAreaMap, rowCount, columnCount))
+        if (!parseGridTemplateAreasRow(range.consumeIncludingWhitespace().value(), gridAreaMap, rowCount, columnCount))
             return nullptr;
         ++rowCount;
@@ -5612 +5611 @@
 
         // Handle a template-area's row.
-        if (m_range.peek().type() != StringToken || !parseGridTemplateAreasRow(m_range.consumeIncludingWhitespace().value().toString(), gridAreaMap, rowCount, columnCount))
+        if (m_range.peek().type() != StringToken || !parseGridTemplateAreasRow(m_range.consumeIncludingWhitespace().value(), gridAreaMap, rowCount, columnCount))
             return false;
         ++rowCount;

trunk/Source/WebCore/css/parser/CSSPropertyParserHelpers.cpp

@@ -2443 +2443 @@
         if (!acceptQuirkyColors)
             return std::nullopt;
-        if (token.type() == IdentToken)
-            string = token.value().toString(); // e.g. FF0000
-        else if (token.type() == NumberToken || token.type() == DimensionToken) {
+        if (token.type() == IdentToken) {
+            view = token.value(); // e.g. FF0000
+            if (view.length() != 3 && view.length() != 6)
+                return std::nullopt;
+        } else if (token.type() == NumberToken || token.type() == DimensionToken) {
             if (token.numericValueType() != IntegerValueType)
                 return std::nullopt;
@@ -2458 +2460 @@
             if (string.length() < 6)
                 string = makeString(&"000000"[string.length()], string);
-        }
-        if (string.length() != 3 && string.length() != 6)
+
+            if (string.length() != 3 && string.length() != 6)
+                return std::nullopt;
+            view = string;
+        } else
             return std::nullopt;
-        view = string;
     }
     auto result = CSSParser::parseHexColor(view);
@@ -3560 +3564 @@
         return AtomString();
     auto name = nameToken.value();
-    return isPredefinedCounterStyle(nameToken.id()) ? name.convertToASCIILowercase() : name.toString();
+    return isPredefinedCounterStyle(nameToken.id()) ? name.convertToASCIILowercaseAtom() : name.toAtomString();
 }
 

trunk/Source/WebCore/dom/ScriptElement.cpp

@@ -369 +369 @@
     const auto& contentSecurityPolicy = *m_element.document().contentSecurityPolicy();
     bool hasKnownNonce = contentSecurityPolicy.allowScriptWithNonce(nonce, m_element.isInUserAgentShadowTree());
-    if (!contentSecurityPolicy.allowInlineScript(m_element.document().url().string(), m_startLineNumber, sourceCode.source().toStringWithoutCopying(), hasKnownNonce))
+    if (!contentSecurityPolicy.allowInlineScript(m_element.document().url().string(), m_startLineNumber, sourceCode.source(), hasKnownNonce))
         return false;
 
@@ -390 +390 @@
         const ContentSecurityPolicy& contentSecurityPolicy = *m_element.document().contentSecurityPolicy();
         bool hasKnownNonce = contentSecurityPolicy.allowScriptWithNonce(m_element.attributeWithoutSynchronization(HTMLNames::nonceAttr), m_element.isInUserAgentShadowTree());
-        if (!contentSecurityPolicy.allowInlineScript(m_element.document().url().string(), m_startLineNumber, sourceCode.source().toStringWithoutCopying(), hasKnownNonce))
+        if (!contentSecurityPolicy.allowInlineScript(m_element.document().url().string(), m_startLineNumber, sourceCode.source(), hasKnownNonce))
             return;
     }

trunk/Source/WebCore/dom/StyledElement.cpp

@@ -197 +197 @@
         startLineNumber = document().scriptableDocumentParser()->textPosition().m_line;
 
-    if (reason == ModifiedByCloning || document().contentSecurityPolicy()->allowInlineStyle(document().url().string(), startLineNumber, String(), isInUserAgentShadowTree()))
+    if (reason == ModifiedByCloning || document().contentSecurityPolicy()->allowInlineStyle(document().url().string(), startLineNumber, { }, isInUserAgentShadowTree()))
         setInlineStyleFromString(newStyleString);
 

trunk/Source/WebCore/dom/TreeScope.cpp

@@ -444 +444 @@
 // FIXME: Would be nice to change this to take a StringView, since that's what callers have
 // and there is no particular advantage to already having a String.
-Element* TreeScope::findAnchor(const String& name)
+Element* TreeScope::findAnchor(StringView name)
 {
     if (name.isEmpty())

trunk/Source/WebCore/dom/TreeScope.h

@@ -105 +105 @@
     // Anchor name matching is case sensitive in strict mode and not case sensitive in
     // quirks mode for historical compatibility reasons.
-    Element* findAnchor(const String& name);
+    Element* findAnchor(StringView name);
 
     ContainerNode& rootNode() const { return m_rootNode; }

trunk/Source/WebCore/editing/cocoa/DataDetection.mm

@@ -169 +169 @@
 bool DataDetection::canBePresentedByDataDetectors(const URL& url)
 {
-    return [PAL::softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)url.protocol().toStringWithoutCopying().convertToASCIILowercase()];
+    return [PAL::softLink_DataDetectorsCore_DDURLTapAndHoldSchemes() containsObject:(NSString *)url.protocol().convertToASCIILowercase()];
 }
 

trunk/Source/WebCore/page/FrameView.cpp

@@ -2210 +2210 @@
 {
     auto fragmentIdentifier = url.fragmentIdentifier();
-    if (scrollToFragmentInternal(fragmentIdentifier.toString()))
+    if (scrollToFragmentInternal(fragmentIdentifier))
         return true;
 
@@ -2220 +2220 @@
 }
 
-bool FrameView::scrollToFragmentInternal(const String& fragmentIdentifier)
+bool FrameView::scrollToFragmentInternal(StringView fragmentIdentifier)
 {
     // If our URL has no ref, then we have no place we need to jump to.

trunk/Source/WebCore/page/FrameView.h

@@ -810 +810 @@
     void updateWidgetPositionsTimerFired();
 
-    bool scrollToFragmentInternal(const String&);
+    bool scrollToFragmentInternal(StringView);
     void scrollToAnchor();
     void scrollPositionChanged(const ScrollPosition& oldPosition, const ScrollPosition& newPosition);

trunk/Source/WebCore/page/SecurityOrigin.cpp

@@ -154 +154 @@
 
 // https://w3c.github.io/webappsec-secure-contexts/#is-origin-trustworthy (Editor's Draft, 17 November 2016)
-static bool shouldTreatAsPotentiallyTrustworthy(const String& protocol, const String& host)
+static bool shouldTreatAsPotentiallyTrustworthy(const String& protocol, StringView host)
 {
     if (LegacySchemeRegistry::shouldTreatURLSchemeAsSecure(protocol))

trunk/Source/WebCore/page/csp/ContentSecurityPolicy.cpp

@@ -323 +323 @@
 
 template<typename Predicate>
-ContentSecurityPolicy::HashInEnforcedAndReportOnlyPoliciesPair ContentSecurityPolicy::findHashOfContentInPolicies(Predicate&& predicate, const String& content, OptionSet<ContentSecurityPolicyHashAlgorithm> algorithms) const
+ContentSecurityPolicy::HashInEnforcedAndReportOnlyPoliciesPair ContentSecurityPolicy::findHashOfContentInPolicies(Predicate&& predicate, StringView content, OptionSet<ContentSecurityPolicyHashAlgorithm> algorithms) const
 {
     if (algorithms.isEmpty() || content.isEmpty())
@@ -405 +405 @@
 }
 
-bool ContentSecurityPolicy::allowInlineScript(const String& contextURL, const WTF::OrdinalNumber& contextLine, const String& scriptContent, bool overrideContentSecurityPolicy) const
+bool ContentSecurityPolicy::allowInlineScript(const String& contextURL, const WTF::OrdinalNumber& contextLine, StringView scriptContent, bool overrideContentSecurityPolicy) const
 {
     if (overrideContentSecurityPolicy)
@@ -428 +428 @@
 }
 
-bool ContentSecurityPolicy::allowInlineStyle(const String& contextURL, const WTF::OrdinalNumber& contextLine, const String& styleContent, bool overrideContentSecurityPolicy) const
+bool ContentSecurityPolicy::allowInlineStyle(const String& contextURL, const WTF::OrdinalNumber& contextLine, StringView styleContent, bool overrideContentSecurityPolicy) const
 {
     if (overrideContentSecurityPolicy)

trunk/Source/WebCore/page/csp/ContentSecurityPolicy.h

@@ -92 +92 @@
     bool allowJavaScriptURLs(const String& contextURL, const WTF::OrdinalNumber& contextLine, bool overrideContentSecurityPolicy = false) const;
     bool allowInlineEventHandlers(const String& contextURL, const WTF::OrdinalNumber& contextLine, bool overrideContentSecurityPolicy = false) const;
-    bool allowInlineScript(const String& contextURL, const WTF::OrdinalNumber& contextLine, const String& scriptContent, bool overrideContentSecurityPolicy = false) const;
-    bool allowInlineStyle(const String& contextURL, const WTF::OrdinalNumber& contextLine, const String& styleContent, bool overrideContentSecurityPolicy = false) const;
+    bool allowInlineScript(const String& contextURL, const WTF::OrdinalNumber& contextLine, StringView scriptContent, bool overrideContentSecurityPolicy = false) const;
+    bool allowInlineStyle(const String& contextURL, const WTF::OrdinalNumber& contextLine, StringView styleContent, bool overrideContentSecurityPolicy = false) const;
 
     bool allowEval(JSC::JSGlobalObject*, bool overrideContentSecurityPolicy = false) const;
@@ -207 +207 @@
 
     using HashInEnforcedAndReportOnlyPoliciesPair = std::pair<bool, bool>;
-    template<typename Predicate> HashInEnforcedAndReportOnlyPoliciesPair findHashOfContentInPolicies(Predicate&&, const String& content, OptionSet<ContentSecurityPolicyHashAlgorithm>) const WARN_UNUSED_RETURN;
+    template<typename Predicate> HashInEnforcedAndReportOnlyPoliciesPair findHashOfContentInPolicies(Predicate&&, StringView content, OptionSet<ContentSecurityPolicyHashAlgorithm>) const WARN_UNUSED_RETURN;
 
     void reportViolation(const String& effectiveViolatedDirective, const ContentSecurityPolicyDirective& violatedDirective, const URL& blockedURL, const String& consoleMessage, JSC::JSGlobalObject*) const;

trunk/Source/WebCore/platform/LegacySchemeRegistry.cpp

@@ -254 +254 @@
 {
     Locker locker { schemeRegistryLock };
-    return schemesHandledBySchemeHandler().contains(scheme.toString());
+    return schemesHandledBySchemeHandler().contains(scheme.toStringWithoutCopying());
 }
 

trunk/Source/WebCore/platform/graphics/cocoa/SourceBufferParserWebM.cpp

@@ -447 +447 @@
         auto slashLocation = codecID.find('/');
         auto length = slashLocation == notFound ? codecID.length() - 2 : slashLocation - 2;
-        m_codec = AtomString { codecID.substring(2, length).convertToASCIILowercase() };
+        m_codec = codecID.substring(2, length).convertToASCIILowercaseAtom();
         return *m_codec;
     }

trunk/Source/WebCore/platform/network/ParsedContentType.cpp

@@ -123 +123 @@
 {
     if (mode == Mode::MimeSniff)
-        return !isValidHTTPToken(input.toStringWithoutCopying());
+        return !isValidHTTPToken(input);
     for (unsigned index = 0; index < input.length(); ++index) {
         if (!isTokenCharacter(input[index]))

trunk/Source/WebCore/platform/text/hyphen/HyphenationLibHyphen.cpp

@@ -279 +279 @@
     // reasons and we should consider switching to a more flexible hyphenation library
     // if it is available.
-    CString utf8StringCopy = string.toStringWithoutCopying().utf8();
+    CString utf8StringCopy = string.utf8();
 
     // WebCore often passes strings like " wordtohyphenate" to the platform layer. Since

trunk/Source/WebCore/rendering/RenderTreeAsText.cpp

@@ -472 +472 @@
         if (Element* element = is<Element>(object.node()) ? downcast<Element>(object.node()) : nullptr) {
             if (element->hasID())
-                ts << " id=\"" + element->getIdAttribute() + "\"";
+                ts << " id=\"" << element->getIdAttribute() << "\"";
 
             if (element->hasClass()) {

trunk/Source/WebCore/svg/SVGSVGElement.cpp

@@ -547 +547 @@
 }
 
-SVGViewElement* SVGSVGElement::findViewAnchor(const String& fragmentIdentifier) const
+SVGViewElement* SVGSVGElement::findViewAnchor(StringView fragmentIdentifier) const
 {
     auto* anchorElement = document().findAnchor(fragmentIdentifier);
@@ -559 +559 @@
 }
 
-SVGSVGElement* SVGSVGElement::findRootAnchor(const String& fragmentIdentifier) const
+SVGSVGElement* SVGSVGElement::findRootAnchor(StringView fragmentIdentifier) const
 {
     if (auto* viewElement = findViewAnchor(fragmentIdentifier))
@@ -566 +566 @@
 }
 
-bool SVGSVGElement::scrollToFragment(const String& fragmentIdentifier)
+bool SVGSVGElement::scrollToFragment(StringView fragmentIdentifier)
 {
     auto renderer = this->renderer();
@@ -617 +617 @@
             if (auto* renderer = rootElement->renderer())
                 RenderSVGResource::markForLayoutAndParentResourceInvalidation(*renderer);
-            m_currentViewFragmentIdentifier = fragmentIdentifier;
+            m_currentViewFragmentIdentifier = fragmentIdentifier.toString();
             return true;
         }

trunk/Source/WebCore/svg/SVGSVGElement.h

@@ -85 +85 @@
     static Ref<SVGSVGElement> create(const QualifiedName&, Document&);
     static Ref<SVGSVGElement> create(Document&);
-    bool scrollToFragment(const String& fragmentIdentifier);
+    bool scrollToFragment(StringView fragmentIdentifier);
     void resetScrollAnchor();
 
@@ -142 +142 @@
     Ref<NodeList> collectIntersectionOrEnclosureList(SVGRect&, SVGElement*, bool (*checkFunction)(SVGElement&, SVGRect&));
 
-    SVGViewElement* findViewAnchor(const String& fragmentIdentifier) const;
+    SVGViewElement* findViewAnchor(StringView fragmentIdentifier) const;
     SVGSVGElement* findRootAnchor(const SVGViewElement*) const;
-    SVGSVGElement* findRootAnchor(const String&) const;
+    SVGSVGElement* findRootAnchor(StringView) const;
 
     bool m_useCurrentView { false };

trunk/Source/WebCore/svg/SVGViewSpec.cpp

@@ -69 +69 @@
 template<typename CharacterType> static constexpr CharacterType viewTargetSpec[] =  {'v', 'i', 'e', 'w', 'T', 'a', 'r', 'g', 'e', 't'};
 
-bool SVGViewSpec::parseViewSpec(const StringView& string)
+bool SVGViewSpec::parseViewSpec(StringView string)
 {
     return readCharactersForParsing(string, [&](auto buffer) -> bool {

trunk/Source/WebCore/svg/SVGViewSpec.h

@@ -37 +37 @@
     }
 
-    bool parseViewSpec(const StringView&);
+    bool parseViewSpec(StringView);
     void reset();
     void resetContextElement() { m_contextElement = nullptr; }

trunk/Source/WebKit/UIProcess/API/Cocoa/WKWebViewConfiguration.mm

@@ -566 +566 @@
         [NSException raise:NSInvalidArgumentException format:@"'%@' is a URL scheme that WKWebView handles natively", urlScheme];
 
-    auto canonicalScheme = WTF::URLParser::maybeCanonicalizeScheme(urlScheme);
+    auto canonicalScheme = WTF::URLParser::maybeCanonicalizeScheme(String(urlScheme));
     if (!canonicalScheme)
         [NSException raise:NSInvalidArgumentException format:@"'%@' is not a valid URL scheme", urlScheme];
@@ -578 +578 @@
 - (id <WKURLSchemeHandler>)urlSchemeHandlerForURLScheme:(NSString *)urlScheme
 {
-    auto canonicalScheme = WTF::URLParser::maybeCanonicalizeScheme(urlScheme);
+    auto canonicalScheme = WTF::URLParser::maybeCanonicalizeScheme(String(urlScheme));
     if (!canonicalScheme)
         return nil;