Move StringView constructors into WTFString.h/AtomicString.h

third_party/WebKit/Source/wtf/text/StringView.h

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WTF_StringView_h
 #define WTF_StringView_h
 
 #include "wtf/Allocator.h"
 #include "wtf/GetPtr.h"
 #if DCHECK_IS_ON()
 #include "wtf/RefPtr.h"
 #endif
-#include "wtf/text/AtomicString.h"
 #include "wtf/text/StringImpl.h"
 #include "wtf/text/Unicode.h"
-#include "wtf/text/WTFString.h"
 #include <cstring>
 
 namespace WTF {
 
+class AtomicString;
+class String;
+
 // A string like object that wraps either an 8bit or 16bit byte sequence
 // and keeps track of the length and the type, it does NOT own the bytes.
 //
 // Since StringView does not own the bytes creating a StringView from a String,
 // then calling clear() on the String will result in a use-after-free. Asserts
 // in ~StringView attempt to enforce this for most common cases.
 //
 // See base/strings/string_piece.h for more details.
 class WTF_EXPORT StringView {
     DISALLOW_NEW_EXCEPT_PLACEMENT_NEW();
 public:
     // Null string.
     StringView() { clear(); }
 
     // From a StringView:
     StringView(const StringView&, unsigned offset, unsigned length);
     StringView(const StringView& view, unsigned offset)
         : StringView(view, offset, view.m_length - offset) {}
 
     // From a StringImpl:
     StringView(StringImpl*);
     StringView(StringImpl*, unsigned offset);
     StringView(StringImpl*, unsigned offset, unsigned length);
 
-    // From a String:
-    StringView(const String& string, unsigned offset, unsigned length)
-        : StringView(string.impl(), offset, length) {}
-    StringView(const String& string, unsigned offset)
-        : StringView(string.impl(), offset) {}
-    StringView(const String& string)
-        : StringView(string.impl()) {}
+    // From an String, implemented in String.h
+    inline StringView(const String&, unsigned offset, unsigned length);
+    inline StringView(const String&, unsigned offset);
+    inline StringView(const String&);
 
-    // From an AtomicString:
-    StringView(const AtomicString& string, unsigned offset, unsigned length)
-        : StringView(string.impl(), offset, length) {}
-    StringView(const AtomicString& string, unsigned offset)
-        : StringView(string.impl(), offset) {}
-    StringView(const AtomicString& string)
-        : StringView(string.impl()) {}
+    // From an AtomicString, implemented in AtomicString.h
+    inline StringView(const AtomicString&, unsigned offset, unsigned length);
+    inline StringView(const AtomicString&, unsigned offset);
+    inline StringView(const AtomicString&);
 
     // From a literal string or LChar buffer:
     StringView(const LChar* chars, unsigned length)
-        : StringView(reinterpret_cast<const void*>(chars), length, true) {}
+        : m_impl(StringImpl::empty())
+        , m_characters8(chars)
+        , m_length(length) {}
     StringView(const char* chars, unsigned length)
         : StringView(reinterpret_cast<const LChar*>(chars), length) {}
     StringView(const LChar* chars)
         : StringView(chars, chars ? strlen(reinterpret_cast<const char*>(chars)) : 0) {}
     StringView(const char* chars)
         : StringView(reinterpret_cast<const LChar*>(chars)) {}
 
     // From a wide literal string or UChar buffer.
     StringView(const UChar* chars, unsigned length)
-        : StringView(reinterpret_cast<const void*>(chars), length, false) {}
+        : m_impl(StringImpl::empty16Bit())
+        , m_characters16(chars)
+        , m_length(length) {}
     StringView(const UChar* chars);
 
-    // From a byte pointer.
-    StringView(const void* bytes, unsigned length, bool is8Bit)
-        : m_impl(is8Bit ? StringImpl::empty() : StringImpl::empty16Bit())
-        , m_bytes(bytes)
-        , m_length(length) {}
-
 #if DCHECK_IS_ON()
     ~StringView();
 #endif
 
     bool isNull() const { return !m_bytes; }
     bool isEmpty() const { return !m_length; }
 
     unsigned length() const { return m_length; }
 
     bool is8Bit() const { DCHECK(m_impl); return m_impl->is8Bit(); }
@@ skipping 123 matching lines @@
 inline bool operator!=(const StringView& a, const StringView& b)
 {
     return !(a == b);
 }
 
 } // namespace WTF
 
 using WTF::StringView;
 
 #endif