Changeset 206196 in webkit

Timestamp:

Sep 20, 2016 8:10:57 PM (8 years ago)

Author:

achristensen@apple.com

Message:

Require WTFMove for String::adopt
​https://bugs.webkit.org/show_bug.cgi?id=162313

Reviewed by Yusuke Suzuki.

Source/JavaScriptCore:

• runtime/JSStringBuilder.h:

(JSC::JSStringBuilder::build):

Source/WebCore:

No change in behavior. This just makes it more clear what is going on when a String adopts a Vector.

• bindings/js/SerializedScriptValue.cpp:

(WebCore::CloneDeserializer::readString):

• css/parser/CSSParser.cpp:

(WebCore::quoteCSSStringInternal):

• dom/Document.cpp:

(WebCore::canonicalizedTitle):

• html/canvas/CanvasRenderingContext2D.cpp:

(WebCore::normalizeSpaces):

• html/parser/HTMLTreeBuilder.cpp:

(WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeRemainingWhitespace):

• platform/Length.cpp:

(WebCore::newCoordsArray):

• platform/URLParser.cpp:

(WebCore::URLParser::parse):
(WebCore::URLParser::serialize):

• platform/graphics/ca/GraphicsLayerCA.cpp:

(WebCore::GraphicsLayerCA::ReplicaState::cloneID):

• platform/text/TextCodecUTF16.cpp:

(WebCore::TextCodecUTF16::decode):

• platform/text/TextCodecUTF8.cpp:

(WebCore::TextCodecUTF8::decode):

• platform/text/mac/TextCodecMac.cpp:

(WebCore::TextCodecMac::decode):

Source/WTF:

• wtf/text/StringImpl.cpp:

(WTF::StringImpl::removeCharacters):
(WTF::StringImpl::simplifyMatchedCharactersToSpace):
(WTF::StringImpl::adopt):

• wtf/text/StringImpl.h:

(WTF::StringImpl::adopt):

• wtf/text/WTFString.h:

(WTF::String::adopt):

Location:

trunk/Source

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/runtime/JSStringBuilder.h (modified) (1 diff)
• WTF/ChangeLog (modified) (1 diff)
• WTF/wtf/text/StringImpl.cpp (modified) (4 diffs)
• WTF/wtf/text/StringImpl.h (modified) (2 diffs)
• WTF/wtf/text/WTFString.h (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/js/SerializedScriptValue.cpp (modified) (1 diff)
• WebCore/css/parser/CSSParser.cpp (modified) (1 diff)
• WebCore/dom/Document.cpp (modified) (1 diff)
• WebCore/html/canvas/CanvasRenderingContext2D.cpp (modified) (1 diff)
• WebCore/html/parser/HTMLTreeBuilder.cpp (modified) (1 diff)
• WebCore/platform/Length.cpp (modified) (1 diff)
• WebCore/platform/URLParser.cpp (modified) (2 diffs)
• WebCore/platform/graphics/ca/GraphicsLayerCA.cpp (modified) (1 diff)
• WebCore/platform/text/LocaleICU.cpp (modified) (5 diffs)
• WebCore/platform/text/TextCodecUTF16.cpp (modified) (1 diff)
• WebCore/platform/text/TextCodecUTF8.cpp (modified) (2 diffs)
• WebCore/platform/text/mac/TextCodecMac.cpp (modified) (1 diff)
• WebCore/platform/win/FileSystemWin.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-09-20  Alex Christensen  <achristensen@webkit.org>
+
+        Require WTFMove for String::adopt
+        https://bugs.webkit.org/show_bug.cgi?id=162313
+
+        Reviewed by Yusuke Suzuki.
+
+        * runtime/JSStringBuilder.h:
+        (JSC::JSStringBuilder::build):
+
 2016-09-20  Joseph Pecoraro  <pecoraro@apple.com>
 

trunk/Source/JavaScriptCore/runtime/JSStringBuilder.h

@@ -80 +80 @@
             if (!buffer8.data())
                 return throwOutOfMemoryError(exec, scope);
-            return jsString(exec, String::adopt(buffer8));
+            return jsString(exec, String::adopt(WTFMove(buffer8)));
         }
         buffer16.shrinkToFit();
         if (!buffer16.data())
             return throwOutOfMemoryError(exec, scope);
-        return jsString(exec, String::adopt(buffer16));
+        return jsString(exec, String::adopt(WTFMove(buffer16)));
     }
 

trunk/Source/WTF/ChangeLog

@@ +1 @@
+2016-09-20  Alex Christensen  <achristensen@webkit.org>
+
+        Require WTFMove for String::adopt
+        https://bugs.webkit.org/show_bug.cgi?id=162313
+
+        Reviewed by Yusuke Suzuki.
+
+        * wtf/text/StringImpl.cpp:
+        (WTF::StringImpl::removeCharacters):
+        (WTF::StringImpl::simplifyMatchedCharactersToSpace):
+        (WTF::StringImpl::adopt):
+        * wtf/text/StringImpl.h:
+        (WTF::StringImpl::adopt):
+        * wtf/text/WTFString.h:
+        (WTF::String::adopt):
+
 2016-09-20  Filip Pizlo  <fpizlo@apple.com>
 

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

@@ -832 +832 @@
     data.shrink(outc);
 
-    return adopt(data);
+    return adopt(WTFMove(data));
 }
 
@@ -876 +876 @@
     data.shrink(outc);
     
-    return adopt(data);
+    return adopt(WTFMove(data));
 }
 
@@ -2003 +2003 @@
 }
 
-Ref<StringImpl> StringImpl::adopt(StringBuffer<LChar>& buffer)
+Ref<StringImpl> StringImpl::adopt(StringBuffer<LChar>&& buffer)
 {
     unsigned length = buffer.length();
@@ -2011 +2011 @@
 }
 
-Ref<StringImpl> StringImpl::adopt(StringBuffer<UChar>& buffer)
+Ref<StringImpl> StringImpl::adopt(StringBuffer<UChar>&& buffer)
 {
     unsigned length = buffer.length();

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

@@ -427 +427 @@
 
     template<typename CharType, size_t inlineCapacity, typename OverflowHandler>
-    static Ref<StringImpl> adopt(Vector<CharType, inlineCapacity, OverflowHandler>& vector)
+    static Ref<StringImpl> adopt(Vector<CharType, inlineCapacity, OverflowHandler>&& vector)
     {
         if (size_t size = vector.size()) {
@@ -438 +438 @@
     }
 
-    WTF_EXPORT_STRING_API static Ref<StringImpl> adopt(StringBuffer<UChar>&);
-    WTF_EXPORT_STRING_API static Ref<StringImpl> adopt(StringBuffer<LChar>&);
+    WTF_EXPORT_STRING_API static Ref<StringImpl> adopt(StringBuffer<UChar>&&);
+    WTF_EXPORT_STRING_API static Ref<StringImpl> adopt(StringBuffer<LChar>&&);
 
     unsigned length() const { return m_length; }

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

@@ -139 +139 @@
     void swap(String& o) { m_impl.swap(o.m_impl); }
 
-    static String adopt(StringBuffer<LChar>& buffer) { return StringImpl::adopt(buffer); }
-    static String adopt(StringBuffer<UChar>& buffer) { return StringImpl::adopt(buffer); }
+    static String adopt(StringBuffer<LChar>&& buffer) { return StringImpl::adopt(WTFMove(buffer)); }
+    static String adopt(StringBuffer<UChar>&& buffer) { return StringImpl::adopt(WTFMove(buffer)); }
     template<typename CharacterType, size_t inlineCapacity, typename OverflowHandler>
-    static String adopt(Vector<CharacterType, inlineCapacity, OverflowHandler>& vector) { return StringImpl::adopt(vector); }
+    static String adopt(Vector<CharacterType, inlineCapacity, OverflowHandler>&& vector) { return StringImpl::adopt(WTFMove(vector)); }
 
     bool isNull() const { return !m_impl; }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-09-20  Alex Christensen  <achristensen@webkit.org>
+
+        Require WTFMove for String::adopt
+        https://bugs.webkit.org/show_bug.cgi?id=162313
+
+        Reviewed by Yusuke Suzuki.
+
+        No change in behavior.  This just makes it more clear what is going on when a String adopts a Vector.
+
+        * bindings/js/SerializedScriptValue.cpp:
+        (WebCore::CloneDeserializer::readString):
+        * css/parser/CSSParser.cpp:
+        (WebCore::quoteCSSStringInternal):
+        * dom/Document.cpp:
+        (WebCore::canonicalizedTitle):
+        * html/canvas/CanvasRenderingContext2D.cpp:
+        (WebCore::normalizeSpaces):
+        * html/parser/HTMLTreeBuilder.cpp:
+        (WebCore::HTMLTreeBuilder::ExternalCharacterTokenBuffer::takeRemainingWhitespace):
+        * platform/Length.cpp:
+        (WebCore::newCoordsArray):
+        * platform/URLParser.cpp:
+        (WebCore::URLParser::parse):
+        (WebCore::URLParser::serialize):
+        * platform/graphics/ca/GraphicsLayerCA.cpp:
+        (WebCore::GraphicsLayerCA::ReplicaState::cloneID):
+        * platform/text/TextCodecUTF16.cpp:
+        (WebCore::TextCodecUTF16::decode):
+        * platform/text/TextCodecUTF8.cpp:
+        (WebCore::TextCodecUTF8::decode):
+        * platform/text/mac/TextCodecMac.cpp:
+        (WebCore::TextCodecMac::decode):
+
 2016-09-20  Jer Noble  <jer.noble@apple.com>
 

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

@@ -1708 +1708 @@
             buffer.append(ch);
         }
-        str = String::adopt(buffer);
+        str = String::adopt(WTFMove(buffer));
 #endif
         return true;

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

@@ -13645 +13645 @@
 
     ASSERT(quotedStringSize == index);
-    return String::adopt(buffer);
+    return String::adopt(WTFMove(buffer));
 }
 

trunk/Source/WebCore/dom/Document.cpp

@@ -1575 +1575 @@
     document->displayBufferModifiedByEncoding(buffer.characters(), buffer.length());
     
-    return StringWithDirection(String::adopt(buffer), titleWithDirection.direction());
+    return StringWithDirection(String::adopt(WTFMove(buffer)), titleWithDirection.direction());
 }
 

trunk/Source/WebCore/html/canvas/CanvasRenderingContext2D.cpp

@@ -2358 +2358 @@
             charVector[i] = ' ';
     }
-    text = String::adopt(charVector);
+    text = String::adopt(WTFMove(charVector));
 }
 

trunk/Source/WebCore/html/parser/HTMLTreeBuilder.cpp

@@ -220 +220 @@
             return String();
 
-        return String::adopt(whitespace);
+        return String::adopt(WTFMove(whitespace));
     }
 

trunk/Source/WebCore/platform/Length.cpp

@@ -100 +100 @@
             spacified[i] = cc;
     }
-    RefPtr<StringImpl> str = StringImpl::adopt(spacified);
+    RefPtr<StringImpl> str = StringImpl::adopt(WTFMove(spacified));
 
     str = str->simplifyWhiteSpace();

trunk/Source/WebCore/platform/URLParser.cpp

@@ -1600 +1600 @@
     }
 
-    if (m_unicodeFragmentBuffer.isEmpty()) {
-        // FIXME: String::adopt should require a WTFMove.
-        m_url.m_string = String::adopt(m_asciiBuffer);
-    } else {
+    if (m_unicodeFragmentBuffer.isEmpty())
+        m_url.m_string = String::adopt(WTFMove(m_asciiBuffer));
+    else {
+        // FIXME: This should use a Vector<UChar> and adopt it.
         StringBuilder builder;
         builder.reserveCapacity(m_asciiBuffer.size() + m_unicodeFragmentBuffer.size());
@@ -2213 +2213 @@
         serializeURLEncodedForm(tuple.second, output);
     }
-    return String::adopt(output);
+    return String::adopt(WTFMove(output));
 }
 

trunk/Source/WebCore/platform/graphics/ca/GraphicsLayerCA.cpp

@@ -2571 +2571 @@
     }
     
-    return String::adopt(result);
+    return String::adopt(WTFMove(result));
 }
 

trunk/Source/WebCore/platform/text/LocaleICU.cpp

@@ -79 +79 @@
     if (U_FAILURE(status))
         return String();
-    return String::adopt(buffer);
+    return String::adopt(WTFMove(buffer));
 }
 
@@ -95 +95 @@
     if (U_FAILURE(status))
         return String();
-    return String::adopt(buffer);
+    return String::adopt(WTFMove(buffer));
 }
 #endif
@@ -159 +159 @@
     if (U_FAILURE(status))
         return emptyString();
-    return String::adopt(buffer);
+    return String::adopt(WTFMove(buffer));
 }
 
@@ -181 +181 @@
         if (U_FAILURE(status))
             return std::make_unique<Vector<String>>();
-        labels->append(String::adopt(buffer));
+        labels->append(String::adopt(WTFMove(buffer)));
     }
     return WTFMove(labels);
@@ -271 +271 @@
         udatpg_getBestPattern(patternGenerator, skeleton, skeletonLength, buffer.data(), length, &status);
         if (U_SUCCESS(status))
-            format = String::adopt(buffer);
+            format = String::adopt(WTFMove(buffer));
     }
     udatpg_close(patternGenerator);

trunk/Source/WebCore/platform/text/TextCodecUTF16.cpp

@@ -112 +112 @@
     buffer.shrink(q - buffer.characters());
 
-    return String::adopt(buffer);
+    return String::adopt(WTFMove(buffer));
 }
 

trunk/Source/WebCore/platform/text/TextCodecUTF8.cpp

@@ -344 +344 @@
     buffer.shrink(destination - buffer.characters());
 
-    return String::adopt(buffer);
+    return String::adopt(WTFMove(buffer));
 
 upConvertTo16Bit:
@@ -420 +420 @@
     buffer16.shrink(destination16 - buffer16.characters());
     
-    return String::adopt(buffer16);
+    return String::adopt(WTFMove(buffer16));
 }
 

trunk/Source/WebCore/platform/text/mac/TextCodecMac.cpp

@@ -265 +265 @@
     }
 
-    String resultString = String::adopt(result);
+    String resultString = String::adopt(WTFMove(result));
 
     // <rdar://problem/3225472>

trunk/Source/WebCore/platform/win/FileSystemWin.cpp

@@ -191 +191 @@
     buffer.shrink(wcslen(buffer.data()));
 
-    return String::adopt(buffer);
+    return String::adopt(WTFMove(buffer));
 }
 
@@ -273 +273 @@
         return String();
     buffer.resize(wcslen(buffer.data()));
-    String directory = String::adopt(buffer);
+    String directory = String::adopt(WTFMove(buffer));
 
     DEPRECATED_DEFINE_STATIC_LOCAL(String, companyNameDirectory, (ASCIILiteral("Apple Computer\\")));