1 files changed, 48 insertions, 5 deletions

diff --git a/chromium/third_party/blink/renderer/core/frame/navigator_language.cc b/chromium/third_party/blink/renderer/core/frame/navigator_language.cc
index 89f5cf01515..d2f3e4cc36c 100644
--- a/chromium/third_party/blink/renderer/core/frame/navigator_language.cc
+++ b/chromium/third_party/blink/renderer/core/frame/navigator_language.cc
@@ -4,22 +4,65 @@
 
 #include "third_party/blink/renderer/core/frame/navigator_language.h"
 
+#include "third_party/blink/renderer/core/probe/core_probes.h"
 #include "third_party/blink/renderer/platform/language.h"
 
 namespace blink {
 
-NavigatorLanguage::NavigatorLanguage() = default;
+Vector<String> ParseAndSanitize(const String& accept_languages) {
+  Vector<String> languages;
+  accept_languages.Split(',', languages);
+
+  // Sanitizing tokens. We could do that more extensively but we should assume
+  // that the accept languages are already sane and support BCP47. It is
+  // likely a waste of time to make sure the tokens matches that spec here.
+  for (size_t i = 0; i < languages.size(); ++i) {
+    String& token = languages[i];
+    token = token.StripWhiteSpace();
+    if (token.length() >= 3 && token[2] == '_')
+      token.replace(2, 1, "-");
+  }
+
+  if (languages.IsEmpty())
+    languages.push_back(DefaultLanguage());
+
+  return languages;
+}
+
+NavigatorLanguage::NavigatorLanguage(ExecutionContext* context)
+    : context_(context) {}
 
 AtomicString NavigatorLanguage::language() {
   return AtomicString(languages().front());
 }
 
-bool NavigatorLanguage::hasLanguagesChanged() const {
-  return languages_changed_;
+const Vector<String>& NavigatorLanguage::languages() {
+  if (languages_dirty_) {
+    String accept_languages_override;
+    probe::applyAcceptLanguageOverride(context_, &accept_languages_override);
+
+    if (!accept_languages_override.IsNull()) {
+      languages_ = ParseAndSanitize(accept_languages_override);
+    } else {
+      languages_ = ParseAndSanitize(GetAcceptLanguages());
+    }
+
+    languages_dirty_ = false;
+  }
+  return languages_;
+}
+
+bool NavigatorLanguage::IsLanguagesDirty() const {
+  return languages_dirty_;
+}
+
+void NavigatorLanguage::SetLanguagesDirty() {
+  languages_dirty_ = true;
+  languages_.clear();
 }
 
-void NavigatorLanguage::SetLanguagesChanged() {
-  languages_changed_ = true;
+void NavigatorLanguage::Trace(blink::Visitor* visitor) {
+  visitor->Trace(context_);
 }
 
 }  // namespace blink