Revert of Expand WTF::StringView's API to be more like StringPiece.

third_party/WebKit/Source/platform/text/TextRun.h

 /*
  * Copyright (C) 2000 Lars Knoll (knoll@kde.org)
  *           (C) 2000 Antti Koivisto (koivisto@kde.org)
  *           (C) 2000 Dirk Mueller (mueller@kde.org)
  * Copyright (C) 2003, 2006, 2007, 2011 Apple Inc. All rights reserved.
  *
  * 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 14 matching lines @@
 #define TextRun_h
 
 #include "platform/PlatformExport.h"
 #include "platform/fonts/Glyph.h"
 #include "platform/geometry/FloatRect.h"
 #include "platform/heap/Heap.h"
 #include "platform/text/TabSize.h"
 #include "platform/text/TextDirection.h"
 #include "platform/text/TextPath.h"
 #include "wtf/Allocator.h"
-#include "wtf/text/StringView.h"
 #include "wtf/text/WTFString.h"
 
 class SkTextBlob;
 
 namespace blink {
 
 enum TextJustify {
     TextJustifyAuto = 0x0,
     TextJustifyNone = 0x1,
     TextJustifyInterWord = 0x2,
@@ skipping 49 matching lines @@
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
         , m_disableSpacing(false)
         , m_textJustify(TextJustifyAuto)
         , m_normalizeSpace(false)
         , m_tabSize(0)
     {
         m_data.characters16 = c;
     }
 
+    TextRun(const String& string, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false)
+        : m_charactersLength(string.length())
+        , m_len(string.length())
+        , m_xpos(xpos)
+        , m_horizontalGlyphStretch(1)
+        , m_expansion(expansion)
+        , m_expansionBehavior(expansionBehavior)
+        , m_allowTabs(false)
+        , m_direction(direction)
+        , m_directionalOverride(directionalOverride)
+        , m_disableSpacing(false)
+        , m_textJustify(TextJustifyAuto)
+        , m_normalizeSpace(false)
+        , m_tabSize(0)
+    {
+        if (!m_charactersLength) {
+            m_is8Bit = true;
+            m_data.characters8 = 0;
+        } else if (string.is8Bit()) {
+            m_data.characters8 = string.characters8();
+            m_is8Bit = true;
+        } else {
+            m_data.characters16 = string.characters16();
+            m_is8Bit = false;
+        }
+    }
+
     TextRun(const StringView& string, float xpos = 0, float expansion = 0, ExpansionBehavior expansionBehavior = AllowTrailingExpansion | ForbidLeadingExpansion, TextDirection direction = LTR, bool directionalOverride = false)
         : m_charactersLength(string.length())
         , m_len(string.length())
         , m_xpos(xpos)
         , m_horizontalGlyphStretch(1)
         , m_expansion(expansion)
         , m_expansionBehavior(expansionBehavior)
         , m_allowTabs(false)
         , m_direction(direction)
         , m_directionalOverride(directionalOverride)
@@ skipping 119 matching lines @@
 
     const TextRun& run;
     int from;
     int to;
     FloatRect bounds;
     RefPtr<const SkTextBlob>* cachedTextBlob;
 };
 
 } // namespace blink
 #endif