diff options
author | Steve Block <steveblock@google.com> | 2011-05-25 19:08:45 +0100 |
---|---|---|
committer | Steve Block <steveblock@google.com> | 2011-06-08 13:51:31 +0100 |
commit | 2bde8e466a4451c7319e3a072d118917957d6554 (patch) | |
tree | 28f4a1b869a513e565c7760d0e6a06e7cf1fe95a /Source/WebKit2/WebProcess/WebProcess.h | |
parent | 6939c99b71d9372d14a0c74a772108052e8c48c8 (diff) | |
download | external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.zip external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.gz external_webkit-2bde8e466a4451c7319e3a072d118917957d6554.tar.bz2 |
Merge WebKit at r82507: Initial merge by git
Change-Id: I60ce9d780725b58b45e54165733a8ffee23b683e
Diffstat (limited to 'Source/WebKit2/WebProcess/WebProcess.h')
-rw-r--r-- | Source/WebKit2/WebProcess/WebProcess.h | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Source/WebKit2/WebProcess/WebProcess.h b/Source/WebKit2/WebProcess/WebProcess.h index 946bb69..d666910 100644 --- a/Source/WebKit2/WebProcess/WebProcess.h +++ b/Source/WebKit2/WebProcess/WebProcess.h @@ -29,11 +29,13 @@ #include "CacheModel.h" #include "ChildProcess.h" #include "DrawingArea.h" +#include "ResourceCachesToClear.h" #include "SandboxExtension.h" #include "SharedMemory.h" #include "TextCheckerState.h" #include "VisitedLinkTable.h" #include "WebGeolocationManager.h" +#include "WebIconDatabaseProxy.h" #include "WebPageGroupProxy.h" #include <WebCore/LinkHash.h> #include <wtf/Forward.h> @@ -76,7 +78,8 @@ public: WebPage* webPage(uint64_t pageID) const; void createWebPage(uint64_t pageID, const WebPageCreationParameters&); void removeWebPage(uint64_t pageID); - + WebPage* focusedWebPage() const; + InjectedBundle* injectedBundle() const { return m_injectedBundle.get(); } bool isSeparateProcess() const; @@ -116,7 +119,9 @@ public: // Geolocation WebGeolocationManager& geolocationManager() { return m_geolocationManager; } - void clearResourceCaches(); + void clearResourceCaches(uint32_t cachesToClear = AllResourceCaches); + + const String& localStorageDirectory() const { return m_localStorageDirectory; } private: WebProcess(); @@ -144,9 +149,11 @@ private: static void calculateCacheSizes(CacheModel cacheModel, uint64_t memorySize, uint64_t diskFreeSize, unsigned& cacheTotalCapacity, unsigned& cacheMinDeadCapacity, unsigned& cacheMaxDeadCapacity, double& deadDecodedDataDeletionInterval, unsigned& pageCacheCapacity, unsigned long& urlCacheMemoryCapacity, unsigned long& urlCacheDiskCapacity); - void platformClearResourceCaches(); + void platformClearResourceCaches(ResourceCachesToClear); void clearApplicationCache(); + void setEnhancedAccessibility(bool); + #if !ENABLE(PLUGIN_PROCESS) void getSitesWithPluginData(const Vector<String>& pluginPaths, uint64_t callbackID); void clearPluginSiteData(const Vector<String>& pluginPaths, const Vector<String>& sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID); @@ -202,6 +209,9 @@ private: TextCheckerState m_textCheckerState; WebGeolocationManager m_geolocationManager; + WebIconDatabaseProxy m_iconDatabaseProxy; + + String m_localStorageDirectory; }; } // namespace WebKit |