Reset the user preferred language overrides in Internals::reset

https://bugs.webkit.org/show_bug.cgi?id=83845

Reviewed by Ryosuke Niwa.

We don't want setting the language override in one test to affect subsequent tests,
so make sure to reset it in Internals::reset.

* testing/Internals.cpp:
(WebCore::Internals::reset):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114065 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index b2c93f0..4846271 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2012-04-12  Anders Carlsson  <andersca@apple.com>
+
+        Reset the user preferred language overrides in Internals::reset
+        https://bugs.webkit.org/show_bug.cgi?id=83845
+
+        Reviewed by Ryosuke Niwa.
+
+        We don't want setting the language override in one test to affect subsequent tests,
+        so make sure to reset it in Internals::reset.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::reset):
+
 2012-04-12  Andrey Kosyakov  <caseq@chromium.org>
 
         [chromium][refactoring] merge CCSingleThreadProxy::{commitIfNeeded,doComposite} into commitAndComposite()

diff --git a/Source/WebCore/testing/Internals.cpp b/Source/WebCore/testing/Internals.cpp
index 01056d7..25a464a 100644 (file)
--- a/Source/WebCore/testing/Internals.cpp
+++ b/Source/WebCore/testing/Internals.cpp
@@ -526,8 +526,12 @@ void Internals::reset(Document* document)
     if (m_settings)
         m_settings->restoreTo(document->page()->settings());
     m_settings = InternalSettings::create(document->frame());
-    if (Page* page = document->page())
+    if (Page* page = document->page()) {
         page->setPagination(Page::Pagination());
+
+        if (document->frame() == page->mainFrame())
+            setUserPreferredLanguages(Vector<String>());
+    }
 }
 
 bool Internals::wasLastChangeUserEdit(Element* textField, ExceptionCode& ec)