Allow WebString.utf8() to take UTF8ConversionMode

third_party/WebKit/public/platform/WebString.h

 /*
  * 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 48 matching lines @@
 //
 // Similarly, use either of following methods to convert WebString to
 // ASCII, Latin1, UTF-8 or UTF-16:
 //
 // * webstring.ascii()
 // * webstring.latin1()
 // * webstring.utf8()
 // * webstring.utf16()
 // * WebString::toNullableString16(webstring)
 //
+// Note that if you need to convert the UTF8 string converted from WebString
+// back to WebString with fromUTF8() you may want to specify Strict
+// UTF8ConversionMode when you call utf8(), as fromUTF8 rejects strings
+// with invalid UTF8 characters.
+//
 // Some types like GURL and base::FilePath can directly take either utf-8 or
 // utf-16 strings. Use following methods to convert WebString to/from GURL or
 // FilePath rather than going through intermediate string types:
 //
 // * GURL WebStringToGURL(const WebString&)
 // * base::FilePath WebStringToFilePath(const WebString&)
 // * WebString FilePathToWebString(const base::FilePath&);
 //
 // It is inexpensive to copy a WebString object.
 // WARNING: It is not safe to pass a WebString across threads!!!
 //
 class WebString {
  public:
+  enum class UTF8ConversionMode {
+    // Ignores errors for invalid characters.
+    kLenient,
+    // Errors out on invalid characters, returns null string.
+    kStrict,
+    // Replace invalid characters with 0xFFFD.
+    // (This is the same conversion mode as base::UTF16ToUTF8)
+    kStrictReplacingErrorsWithFFFD,
+  };
+
   ~WebString() { reset(); }
 
   WebString() {}
 
   WebString(const WebUChar* data, size_t len) { assign(data, len); }
 
   WebString(const WebString& s) { assign(s); }
 
   WebString& operator=(const WebString& s) {
     assign(s);
     return *this;
   }
 
   BLINK_COMMON_EXPORT void reset();
   BLINK_COMMON_EXPORT void assign(const WebString&);
   BLINK_COMMON_EXPORT void assign(const WebUChar* data, size_t len);
 
   BLINK_COMMON_EXPORT bool equals(const WebString&) const;
   BLINK_COMMON_EXPORT bool equals(const char* characters) const;
 
   BLINK_COMMON_EXPORT size_t length() const;
 
   bool isEmpty() const { return !length(); }
   bool isNull() const { return m_private.isNull(); }
 
-  BLINK_COMMON_EXPORT std::string utf8() const;
+  BLINK_COMMON_EXPORT std::string utf8(
+      UTF8ConversionMode = UTF8ConversionMode::kLenient) const;
 
   BLINK_COMMON_EXPORT static WebString fromUTF8(const char* data,
                                                 size_t length);
   BLINK_COMMON_EXPORT static WebString fromUTF8(const char* data);
 
   static WebString fromUTF8(const std::string& s) {
     return fromUTF8(s.data(), s.length());
   }
 
   base::string16 utf16() const {
@@ skipping 114 matching lines @@
   return a.equals(b);
 }
 
 inline bool operator!=(const WebString& a, const WebString& b) {
   return !(a == b);
 }
 
 }  // namespace blink
 
 #endif