Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(143)

Unified Diff: third_party/WebKit/Source/wtf/text/StringConcatenate.cpp

Issue 2245773002: Simplify and clean up StringTypeAdaptor and StringAppend. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: const ref it all. Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/wtf/text/StringConcatenate.cpp
diff --git a/third_party/WebKit/Source/wtf/text/StringConcatenate.cpp b/third_party/WebKit/Source/wtf/text/StringConcatenate.cpp
index 7da90e9cabd9f540cf1519e785f19c5f8f8344ce..9c15ed1374a3d18c8f0f54a008d791862548505c 100644
--- a/third_party/WebKit/Source/wtf/text/StringConcatenate.cpp
+++ b/third_party/WebKit/Source/wtf/text/StringConcatenate.cpp
@@ -12,13 +12,13 @@
#define WTF_STRINGTYPEADAPTER_COPIED_WTF_STRING() ((void)0)
#endif
-void WTF::StringTypeAdapter<char*>::writeTo(LChar* destination)
+void WTF::StringTypeAdapter<char*>::writeTo(LChar* destination) const
{
for (unsigned i = 0; i < m_length; ++i)
destination[i] = static_cast<LChar>(m_buffer[i]);
}
-void WTF::StringTypeAdapter<char*>::writeTo(UChar* destination)
+void WTF::StringTypeAdapter<char*>::writeTo(UChar* destination) const
{
for (unsigned i = 0; i < m_length; ++i) {
unsigned char c = m_buffer[i];
@@ -32,12 +32,12 @@ WTF::StringTypeAdapter<LChar*>::StringTypeAdapter(LChar* buffer)
{
}
-void WTF::StringTypeAdapter<LChar*>::writeTo(LChar* destination)
+void WTF::StringTypeAdapter<LChar*>::writeTo(LChar* destination) const
{
memcpy(destination, m_buffer, m_length * sizeof(LChar));
}
-void WTF::StringTypeAdapter<LChar*>::writeTo(UChar* destination)
+void WTF::StringTypeAdapter<LChar*>::writeTo(UChar* destination) const
{
StringImpl::copyChars(destination, m_buffer, m_length);
}
@@ -54,23 +54,23 @@ WTF::StringTypeAdapter<const UChar*>::StringTypeAdapter(const UChar* buffer)
m_length = len;
}
-void WTF::StringTypeAdapter<const UChar*>::writeTo(UChar* destination)
+void WTF::StringTypeAdapter<const UChar*>::writeTo(UChar* destination) const
{
memcpy(destination, m_buffer, m_length * sizeof(UChar));
}
WTF::StringTypeAdapter<const char*>::StringTypeAdapter(const char* buffer)
-: m_buffer(buffer)
-, m_length(strlen(buffer))
+ : m_buffer(buffer)
+ , m_length(strlen(buffer))
{
}
-void WTF::StringTypeAdapter<const char*>::writeTo(LChar* destination)
+void WTF::StringTypeAdapter<const char*>::writeTo(LChar* destination) const
{
memcpy(destination, m_buffer, static_cast<size_t>(m_length) * sizeof(LChar));
}
-void WTF::StringTypeAdapter<const char*>::writeTo(UChar* destination)
+void WTF::StringTypeAdapter<const char*>::writeTo(UChar* destination) const
{
for (unsigned i = 0; i < m_length; ++i) {
unsigned char c = m_buffer[i];
@@ -79,46 +79,22 @@ void WTF::StringTypeAdapter<const char*>::writeTo(UChar* destination)
}
WTF::StringTypeAdapter<const LChar*>::StringTypeAdapter(const LChar* buffer)
-: m_buffer(buffer)
-, m_length(strlen(reinterpret_cast<const char*>(buffer)))
+ : m_buffer(buffer)
+ , m_length(strlen(reinterpret_cast<const char*>(buffer)))
{
}
-void WTF::StringTypeAdapter<const LChar*>::writeTo(LChar* destination)
+void WTF::StringTypeAdapter<const LChar*>::writeTo(LChar* destination) const
{
memcpy(destination, m_buffer, static_cast<size_t>(m_length) * sizeof(LChar));
}
-void WTF::StringTypeAdapter<const LChar*>::writeTo(UChar* destination)
+void WTF::StringTypeAdapter<const LChar*>::writeTo(UChar* destination) const
{
StringImpl::copyChars(destination, m_buffer, m_length);
}
-void WTF::StringTypeAdapter<Vector<char>>::writeTo(LChar* destination)
-{
- for (size_t i = 0; i < m_buffer.size(); ++i)
- destination[i] = static_cast<unsigned char>(m_buffer[i]);
-}
-
-void WTF::StringTypeAdapter<Vector<char>>::writeTo(UChar* destination)
-{
- for (size_t i = 0; i < m_buffer.size(); ++i)
- destination[i] = static_cast<unsigned char>(m_buffer[i]);
-}
-
-void WTF::StringTypeAdapter<Vector<LChar>>::writeTo(LChar* destination)
-{
- for (size_t i = 0; i < m_buffer.size(); ++i)
- destination[i] = m_buffer[i];
-}
-
-void WTF::StringTypeAdapter<Vector<LChar>>::writeTo(UChar* destination)
-{
- for (size_t i = 0; i < m_buffer.size(); ++i)
- destination[i] = m_buffer[i];
-}
-
-void WTF::StringTypeAdapter<String>::writeTo(LChar* destination)
+void WTF::StringTypeAdapter<String>::writeTo(LChar* destination) const
{
unsigned length = m_buffer.length();
@@ -130,7 +106,7 @@ void WTF::StringTypeAdapter<String>::writeTo(LChar* destination)
WTF_STRINGTYPEADAPTER_COPIED_WTF_STRING();
}
-void WTF::StringTypeAdapter<String>::writeTo(UChar* destination)
+void WTF::StringTypeAdapter<String>::writeTo(UChar* destination) const
{
unsigned length = m_buffer.length();
« no previous file with comments | « third_party/WebKit/Source/wtf/text/StringConcatenate.h ('k') | third_party/WebKit/Source/wtf/text/StringOperators.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698