Merge 3029: Avoid uloc_setKeywordValue if the locale contains "@"

third_party/WebKit/Source/platform/LayoutLocale.cpp

 // 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.
 
 #include "platform/LayoutLocale.h"
 
 #include "platform/Language.h"
 #include "platform/fonts/AcceptLanguagesResolver.h"
 #include "platform/text/ICUError.h"
 #include "platform/text/LocaleToScriptMapping.h"
@@ skipping 171 matching lines @@
   const LayoutLocale& locale = valueOrDefault(get(localeString));
   locale.m_hyphenationComputed = true;
   locale.m_hyphenation = hyphenation;
 }
 
 AtomicString LayoutLocale::localeWithBreakKeyword(
     LineBreakIteratorMode mode) const {
   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());
 
   const char* keywordValue = nullptr;
   switch (mode) {
     default:
       NOTREACHED();
     // Fall through.
     case LineBreakIteratorMode::Default:
@@ skipping 26 matching lines @@
     DCHECK_EQ(lengthNeeded, lengthNeeded2);
     if (U_SUCCESS(status) && lengthNeeded == lengthNeeded2)
       return AtomicString::fromUTF8(buffer.data(), lengthNeeded);
   }
 
   NOTREACHED();
   return m_string;
 }
 
 }  // namespace blink