summaryrefslogtreecommitdiff
path: root/Source/WebKit2/WebProcess/WebProcess.h
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
committerSimon Hausmann <simon.hausmann@nokia.com>2012-02-03 09:55:33 +0100
commitcd44dc59cdfc39534aef4d417e9f3c412e3be139 (patch)
tree8d89889ba95ed6ec9322e733846cc9cce9d7dff1 /Source/WebKit2/WebProcess/WebProcess.h
parentd11f84f5b5cdc0d92a08af01b13472fdd5f9acb9 (diff)
downloadqtwebkit-cd44dc59cdfc39534aef4d417e9f3c412e3be139.tar.gz
Imported WebKit commit fce473cb4d55aa9fe9d0b0322a2fffecb731b961 (http://svn.webkit.org/repository/webkit/trunk@106560)
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.h')
-rw-r--r--Source/WebKit2/WebProcess/WebProcess.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h
index 1e50284c0..efa2e681a 100644
--- a/Source/WebKit2/WebProcess/WebProcess.h
+++ b/Source/WebKit2/WebProcess/WebProcess.h
@@ -82,10 +82,10 @@ class WebProcess : public ChildProcess, private CoreIPC::Connection::QueueClient
public:
static WebProcess& shared();
- void initialize(CoreIPC::Connection::Identifier, RunLoop*);
+ void initialize(CoreIPC::Connection::Identifier, WebCore::RunLoop*);
CoreIPC::Connection* connection() const { return m_connection->connection(); }
- RunLoop* runLoop() const { return m_runLoop; }
+ WebCore::RunLoop* runLoop() const { return m_runLoop; }
WebConnectionToUIProcess* webConnectionToUIProcess() const { return m_connection.get(); }
@@ -161,7 +161,7 @@ private:
void setDefaultRequestTimeoutInterval(double);
void setAlwaysUsesComplexTextCodePath(bool);
void setShouldUseFontSmoothing(bool);
- void languageChanged(const String&) const;
+ void userPreferredLanguagesChanged(const Vector<String>&) const;
void fullKeyboardAccessModeChanged(bool fullKeyboardAccessEnabled);
#if PLATFORM(WIN)
void setShouldPaintNativeControls(bool);
@@ -241,7 +241,7 @@ private:
bool m_inDidClose;
- RunLoop* m_runLoop;
+ WebCore::RunLoop* m_runLoop;
// FIXME: The visited link table should not be per process.
VisitedLinkTable m_visitedLinkTable;