Avoid uloc_setKeywordValue if the locale contains "@"

third_party/WebKit/Source/platform/LayoutLocale.cpp

Index: third_party/WebKit/Source/platform/LayoutLocale.cpp
diff --git a/third_party/WebKit/Source/platform/LayoutLocale.cpp b/third_party/WebKit/Source/platform/LayoutLocale.cpp
index dcda244d1eb76f581c4a706e08f70ae25af6c3ca..998e6068bbaacfb8591e6a97d8165de8af003c9f 100644
--- a/third_party/WebKit/Source/platform/LayoutLocale.cpp
+++ b/third_party/WebKit/Source/platform/LayoutLocale.cpp
@@ -189,6 +189,11 @@ AtomicString LayoutLocale::localeWithBreakKeyword(
   if (m_string.isEmpty())
     return m_string;
 
+  // uloc_setKeywordValue_58 has a problem to handle "@" in the original
+  // string. crbug.com/697859
+  if (m_string.contains('@'))
+    return m_string;
+
   CString utf8Locale = m_string.utf8();
   Vector<char> buffer(utf8Locale.length() + 11, 0);
   memcpy(buffer.data(), utf8Locale.data(), utf8Locale.length());