Replace StringImpl::empty{16Bit}() with a static member

third_party/WebKit/Source/wtf/text/WTFString.cpp

 /*
  * (C) 1999 Lars Knoll (knoll@kde.org)
  * Copyright (C) 2004, 2005, 2006, 2007, 2008, 2010, 2012 Apple Inc. All rights
  * reserved.
  * Copyright (C) 2007-2009 Torch Mobile, Inc.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
  * License as published by the Free Software Foundation; either
  * version 2 of the License, or (at your option) any later version.
@@ skipping 242 matching lines @@
 
 void String::ensure16Bit() {
   if (isNull())
     return;
   if (!is8Bit())
     return;
   if (unsigned length = this->length())
     m_impl =
         make16BitFrom8BitSource(m_impl->characters8(), length).releaseImpl();
   else
-    m_impl = StringImpl::empty16Bit();
+    m_impl = StringImpl::empty16Bit;
 }
 
 void String::truncate(unsigned length) {
   if (m_impl)
     m_impl = m_impl->truncate(length);
 }
 
 void String::remove(unsigned start, unsigned lengthToRemove) {
   if (m_impl)
     m_impl = m_impl->remove(start, lengthToRemove);
@@ skipping 504 matching lines @@
 }
 
 String String::fromUTF8WithLatin1Fallback(const LChar* string, size_t size) {
   String utf8 = fromUTF8(string, size);
   if (!utf8)
     return String(string, size);
   return utf8;
 }
 
 const String& emptyString() {
-  DEFINE_STATIC_LOCAL(String, emptyString, (StringImpl::empty()));
+  DEFINE_STATIC_LOCAL(String, emptyString, (StringImpl::empty));
   return emptyString;

[esprehn, 2017/02/01 05:23:44]

We should probably make these statics too.

[Charlie Harrison, 2017/02/01 05:29:48]

Yeah I can probably do another patch for this, but there are a *lot* more
callers so the patch will be intense (unless we do something weird like inline
the function).

[esprehn, 2017/02/01 05:47:39]

That seems like a reasonable thing to do. Add String::empty and then make the
function inline and just return it. Add a TODO to clean up the tons of callers.
Then someone motivated (maybe you later) can clean it up.

 }
 
 const String& emptyString16Bit() {
-  DEFINE_STATIC_LOCAL(String, emptyString, (StringImpl::empty16Bit()));
+  DEFINE_STATIC_LOCAL(String, emptyString, (StringImpl::empty16Bit));
   return emptyString;
 }
 
 std::ostream& operator<<(std::ostream& out, const String& string) {
   if (string.isNull())
     return out << "<null>";
 
   out << '"';
   for (unsigned index = 0; index < string.length(); ++index) {
     // Print shorthands for select cases.
@@ skipping 32 matching lines @@
   return out << '"';
 }
 
 #ifndef NDEBUG
 void String::show() const {
   dataLogF("%s\n", asciiDebug(impl()).data());
 }
 #endif
 
 }  // namespace WTF