diff options
| author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:56:46 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-16 14:57:30 +0200 |
| commit | b297e0fa5c217c9467033b7c8b46891a52870120 (patch) | |
| tree | 43fc14689295e9e64f2719d05aad94e3049f6cd7 /Source/WebKit2/WebProcess/WebProcess.h | |
| parent | 69d517dbfa69903d8593cc1737f0474b21e3251e (diff) | |
| download | qtwebkit-b297e0fa5c217c9467033b7c8b46891a52870120.tar.gz | |
Revert "Imported WebKit commit 0dc6cd75e1d4836eaffbb520be96fac4847cc9d2 (http://svn.webkit.org/repository/webkit/trunk@131300)"
This reverts commit 5466563f4b5b6b86523e3f89bb7f77e5b5270c78.
Caused OOM issues on some CI machines :(
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.h')
| -rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.h | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h index eccbb8d60..e34d15f29 100644 --- a/Source/WebKit2/WebProcess/WebProcess.h +++ b/Source/WebKit2/WebProcess/WebProcess.h @@ -150,12 +150,14 @@ public: #if PLATFORM(MAC) pid_t presenterApplicationPid() const { return m_presenterApplicationPid; } bool shouldForceScreenFontSubstitution() const { return m_shouldForceScreenFontSubstitution; } -#endif +#endif #if PLATFORM(QT) QNetworkAccessManager* networkAccessManager() { return m_networkAccessManager; } #endif + bool shouldUseCustomRepresentationForResponse(const WebCore::ResourceResponse&) const; + // Text Checking const TextCheckerState& textCheckerState() const { return m_textCheckerState; } @@ -180,6 +182,7 @@ public: #if ENABLE(PLUGIN_PROCESS) PluginProcessConnectionManager& pluginProcessConnectionManager() { return m_pluginProcessConnectionManager; } + bool disablePluginProcessMessageTimeout() const { return m_disablePluginProcessMessageTimeout; } #endif EventDispatcher& eventDispatcher() { return m_eventDispatcher; } @@ -248,8 +251,6 @@ private: void garbageCollectJavaScriptObjects(); void setJavaScriptGarbageCollectorTimerEnabled(bool flag); - void postInjectedBundleMessage(const CoreIPC::DataReference& messageData); - #if USE(SECURITY_FRAMEWORK) void secItemResponse(CoreIPC::Connection*, uint64_t requestID, const SecItemResponseData&); void secKeychainItemResponse(CoreIPC::Connection*, uint64_t requestID, const SecKeychainItemResponseData&); @@ -265,6 +266,7 @@ private: virtual void didReceiveSyncMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*, OwnPtr<CoreIPC::ArgumentEncoder>&); virtual void didClose(CoreIPC::Connection*); virtual void didReceiveInvalidMessage(CoreIPC::Connection*, CoreIPC::MessageID); + virtual void syncMessageSendTimedOut(CoreIPC::Connection*); #if PLATFORM(WIN) virtual Vector<HWND> windowsToReceiveSentMessagesWhileWaitingForSyncReply(); #endif @@ -318,6 +320,8 @@ private: HashMap<uint64_t, RefPtr<WebCore::PlatformMessagePortChannel> > m_messagePortChannels; #endif + HashSet<String, CaseFoldingHash> m_mimeTypesWithCustomRepresentations; + TextCheckerState m_textCheckerState; WebGeolocationManager m_geolocationManager; #if ENABLE(BATTERY_STATUS) @@ -335,6 +339,7 @@ private: #if ENABLE(PLUGIN_PROCESS) PluginProcessConnectionManager m_pluginProcessConnectionManager; + bool m_disablePluginProcessMessageTimeout; #endif #if USE(SOUP) |