Allow WebString.utf8() to take UTF8ConversionMode

third_party/WebKit/Source/platform/exported/WebString.cpp

 /*
  * Copyright (C) 2009 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 20 matching lines @@
 #include "public/platform/WebString.h"
 
 #include "base/strings/string_util.h"
 #include "wtf/text/ASCIIFastPath.h"
 #include "wtf/text/AtomicString.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/StringUTF8Adaptor.h"
 #include "wtf/text/StringView.h"
 #include "wtf/text/WTFString.h"
 
+#define STATIC_ASSERT_ENUM(a, b)                            \
+  static_assert(static_cast<int>(a) == static_cast<int>(b), \
+                "mismatching enums: " #a)
+
+STATIC_ASSERT_ENUM(WTF::LenientUTF8Conversion,
+                   blink::WebString::UTF8ConversionMode::kLenient);
+STATIC_ASSERT_ENUM(WTF::StrictUTF8Conversion,
+                   blink::WebString::UTF8ConversionMode::kStrict);
+STATIC_ASSERT_ENUM(
+    WTF::StrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD,
+    blink::WebString::UTF8ConversionMode::kStrictReplacingErrorsWithFFFD);
+
 namespace blink {
 
 void WebString::reset() {
   m_private.reset();
 }
 
 void WebString::assign(const WebString& other) {
   assign(other.m_private.get());
 }
 
@@ skipping 10 matching lines @@
 }
 
 const WebLChar* WebString::data8() const {
   return !m_private.isNull() && is8Bit() ? m_private->characters8() : 0;
 }
 
 const WebUChar* WebString::data16() const {
   return !m_private.isNull() && !is8Bit() ? m_private->characters16() : 0;
 }
 
-std::string WebString::utf8() const {
-  StringUTF8Adaptor utf8(m_private.get());
+std::string WebString::utf8(UTF8ConversionMode mode) const {
+  StringUTF8Adaptor utf8(m_private.get(),
+                         static_cast<WTF::UTF8ConversionMode>(mode));
   return std::string(utf8.data(), utf8.length());
 }
 
 WebString WebString::fromUTF8(const char* data, size_t length) {
   return String::fromUTF8(data, length);
 }
 
 WebString WebString::fromUTF8(const char* data) {
   return String::fromUTF8(data);
 }
@@ skipping 89 matching lines @@
 
 WebString::operator WTF::AtomicString() const {
   return WTF::AtomicString(m_private.get());
 }
 
 void WebString::assign(WTF::StringImpl* p) {
   m_private = p;
 }
 
 }  // namespace blink