diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-02-03 09:55:33 +0100 |
| commit | cd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch) | |
| tree | 8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebKit2/WebProcess/WebProcess.cpp | |
| parent | d11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff) | |
| download | qtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz | |
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.cpp')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.cpp b/Source/WebKit2/WebProcess/WebProcess.cpp index 39b3bc8e5..d0981071f 100644 --- a/Source/WebKit2/WebProcess/WebProcess.cpp +++ b/Source/WebKit2/WebProcess/WebProcess.cpp @@ -31,7 +31,6 @@ #include "InjectedBundle.h" #include "InjectedBundleMessageKinds.h" #include "InjectedBundleUserMessageCoders.h" -#include "RunLoop.h" #include "SandboxExtension.h" #include "StatisticsData.h" #include "WebApplicationCacheManager.h" @@ -72,6 +71,7 @@ #include <WebCore/PageCache.h> #include <WebCore/PageGroup.h> #include <WebCore/ResourceHandle.h> +#include <WebCore/RunLoop.h> #include <WebCore/SchemeRegistry.h> #include <WebCore/SecurityOrigin.h> #include <WebCore/Settings.h> @@ -213,8 +213,8 @@ void WebProcess::initializeWebProcess(const WebProcessCreationParameters& parame setShouldTrackVisitedLinks(parameters.shouldTrackVisitedLinks); setCacheModel(static_cast<uint32_t>(parameters.cacheModel)); - if (!parameters.languageCode.isEmpty()) - overrideDefaultLanguage(parameters.languageCode); + if (!parameters.languages.isEmpty()) + overrideUserPreferredLanguages(parameters.languages); m_textCheckerState = parameters.textCheckerState; @@ -288,9 +288,9 @@ void WebProcess::setShouldUseFontSmoothing(bool useFontSmoothing) WebCore::Font::setShouldUseSmoothing(useFontSmoothing); } -void WebProcess::languageChanged(const String& language) const +void WebProcess::userPreferredLanguagesChanged(const Vector<String>& languages) const { - overrideDefaultLanguage(language); + overrideUserPreferredLanguages(languages); } void WebProcess::fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled) |