Title: [114065] trunk/Source/WebCore
- Revision
- 114065
- Author
- [email protected]
- Date
- 2012-04-12 18:26:17 -0700 (Thu, 12 Apr 2012)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (114064 => 114065)
--- trunk/Source/WebCore/ChangeLog 2012-04-13 01:11:16 UTC (rev 114064)
+++ trunk/Source/WebCore/ChangeLog 2012-04-13 01:26:17 UTC (rev 114065)
@@ -1,3 +1,16 @@
+2012-04-12 Anders Carlsson <[email protected]>
+
+ 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 <[email protected]>
[chromium][refactoring] merge CCSingleThreadProxy::{commitIfNeeded,doComposite} into commitAndComposite()
Modified: trunk/Source/WebCore/testing/Internals.cpp (114064 => 114065)
--- trunk/Source/WebCore/testing/Internals.cpp 2012-04-13 01:11:16 UTC (rev 114064)
+++ trunk/Source/WebCore/testing/Internals.cpp 2012-04-13 01:26:17 UTC (rev 114065)
@@ -526,8 +526,12 @@
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)
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
