Changeset 82906 in webkit

Timestamp:

Apr 4, 2011 10:38:43 PM (13 years ago)

Author:

weinig@apple.com

Message:

Remove duplicate API from WKContext
<rdar://problem/8727879>
​https://bugs.webkit.org/show_bug.cgi?id=57815

Reviewed by Brian Weinstein.

Source/WebKit2:

• Remove WKContextClearResourceCaches and WKContextClearApplicationCache in favor of their more modern counterparts WKResourceCacheManagerClearCacheForAllOrigins and WKApplicationCacheManagerDeleteAllEntries.

• Expand clearing functionality of WKResourceCacheManager by adding type of resources to clear.

• Shared/WebProcessCreationParameters.cpp:

(WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
(WebKit::WebProcessCreationParameters::encode):
(WebKit::WebProcessCreationParameters::decode):

• Shared/WebProcessCreationParameters.h:

Remove clearing bools.

• UIProcess/API/C/WKAPICast.h:

(WebKit::toResourceCachesToClear):
Update for new name of enum.

• UIProcess/API/C/WKContext.cpp:
• UIProcess/API/C/WKContext.h:

Remove WKContextClearResourceCaches and WKContextClearApplicationCache.

• UIProcess/API/C/WKResourceCacheManager.cpp:

(WKResourceCacheManagerClearCacheForOrigin):
(WKResourceCacheManagerClearCacheForAllOrigins):

• UIProcess/API/C/WKResourceCacheManager.h:

Add WKResourceCachesToClear enum and use it in the clearing functions.

• UIProcess/WebContext.cpp:

(WebKit::WebContext::WebContext):
(WebKit::WebContext::ensureWebProcess):

• UIProcess/WebContext.h:
• WebProcess/WebProcess.messages.in:

Remove clearing functions and setting of bools for clear on launch.

• UIProcess/WebFullScreenManagerProxy.cpp:

Remove unnecessary #include.

• UIProcess/WebResourceCacheManagerProxy.cpp:

(WebKit::WebResourceCacheManagerProxy::clearCacheForOrigin):
(WebKit::WebResourceCacheManagerProxy::clearCacheForAllOrigins):

• UIProcess/WebResourceCacheManagerProxy.h:
• WebProcess/ResourceCache/WebResourceCacheManager.cpp:

(WebKit::WebResourceCacheManager::clearCacheForOrigin):
(WebKit::WebResourceCacheManager::clearCacheForAllOrigins):

• WebProcess/ResourceCache/WebResourceCacheManager.h:
• WebProcess/ResourceCache/WebResourceCacheManager.messages.in:

Add enum parameter describing what type of caches to clear.

• WebProcess/WebProcess.cpp:

(WebKit::WebProcess::initializeWebProcess):
(WebKit::WebProcess::clearResourceCaches):

• WebProcess/WebProcess.h:

No longer need to use opaque type now that it is not a message receiver.

Tools:

• TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
• TestWebKitAPI/Tests/WebKit2/SendingMessagesToTheWebProcessBeforeItIsValid.cpp: Removed.
• TestWebKitAPI/win/TestWebKitAPI.vcproj:

Remove SendingMessagesToTheWebProcessBeforeItIsValid since the API it was testing is now removed.

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/Shared/WebProcessCreationParameters.cpp (modified) (3 diffs)
• Source/WebKit2/Shared/WebProcessCreationParameters.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKAPICast.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/C/WKContext.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKContext.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/WebContext.cpp (modified) (3 diffs)
• Source/WebKit2/UIProcess/WebContext.h (modified) (2 diffs)
• Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp (modified) (2 diffs)
• Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h (modified) (2 diffs)
• Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp (modified) (3 diffs)
• Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h (modified) (2 diffs)
• Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.messages.in (modified) (1 diff)
• Source/WebKit2/WebProcess/WebProcess.cpp (modified) (2 diffs)
• Source/WebKit2/WebProcess/WebProcess.h (modified) (1 diff)
• Source/WebKit2/WebProcess/WebProcess.messages.in (modified) (2 diffs)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (modified) (4 diffs)
• Tools/TestWebKitAPI/Tests/WebKit2/SendingMessagesToTheWebProcessBeforeItIsValid.cpp (deleted)
• Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-04-04  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Brian Weinstein.
+
+        Remove duplicate API from WKContext
+        <rdar://problem/8727879>
+        https://bugs.webkit.org/show_bug.cgi?id=57815
+
+        - Remove WKContextClearResourceCaches and WKContextClearApplicationCache in favor
+          of their more modern counterparts WKResourceCacheManagerClearCacheForAllOrigins
+          and WKApplicationCacheManagerDeleteAllEntries.
+
+        - Expand clearing functionality of WKResourceCacheManager by adding type of resources
+          to clear.
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::WebProcessCreationParameters):
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        Remove clearing bools.
+
+        * UIProcess/API/C/WKAPICast.h:
+        (WebKit::toResourceCachesToClear):
+        Update for new name of enum.
+
+        * UIProcess/API/C/WKContext.cpp:
+        * UIProcess/API/C/WKContext.h:
+        Remove WKContextClearResourceCaches and WKContextClearApplicationCache.
+
+        * UIProcess/API/C/WKResourceCacheManager.cpp:
+        (WKResourceCacheManagerClearCacheForOrigin):
+        (WKResourceCacheManagerClearCacheForAllOrigins):
+        * UIProcess/API/C/WKResourceCacheManager.h:
+        Add WKResourceCachesToClear enum and use it in the clearing functions.
+
+        * UIProcess/WebContext.cpp:
+        (WebKit::WebContext::WebContext):
+        (WebKit::WebContext::ensureWebProcess):
+        * UIProcess/WebContext.h:
+        * WebProcess/WebProcess.messages.in:
+        Remove clearing functions and setting of bools for clear on launch.
+
+        * UIProcess/WebFullScreenManagerProxy.cpp:
+        Remove unnecessary #include.
+
+        * UIProcess/WebResourceCacheManagerProxy.cpp:
+        (WebKit::WebResourceCacheManagerProxy::clearCacheForOrigin):
+        (WebKit::WebResourceCacheManagerProxy::clearCacheForAllOrigins):
+        * UIProcess/WebResourceCacheManagerProxy.h:
+        * WebProcess/ResourceCache/WebResourceCacheManager.cpp:
+        (WebKit::WebResourceCacheManager::clearCacheForOrigin):
+        (WebKit::WebResourceCacheManager::clearCacheForAllOrigins):
+        * WebProcess/ResourceCache/WebResourceCacheManager.h:
+        * WebProcess/ResourceCache/WebResourceCacheManager.messages.in:
+        Add enum parameter describing what type of caches to clear.
+
+        * WebProcess/WebProcess.cpp:
+        (WebKit::WebProcess::initializeWebProcess):
+        (WebKit::WebProcess::clearResourceCaches):
+        * WebProcess/WebProcess.h:
+        No longer need to use opaque type now that it is not a message receiver.
+
 2011-04-04  David Kilzer  <ddkilzer@apple.com>
 

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.cpp

@@ -33 +33 @@
 WebProcessCreationParameters::WebProcessCreationParameters()
     : shouldTrackVisitedLinks(false)
-    , clearResourceCaches(false)
-    , clearApplicationCache(false)
     , shouldAlwaysUseComplexTextCodePath(false)
     , defaultRequestTimeoutInterval(INT_MAX)
@@ -59 +57 @@
     encoder->encodeEnum(cacheModel);
     encoder->encode(shouldTrackVisitedLinks);
-    encoder->encode(clearResourceCaches);
-    encoder->encode(clearApplicationCache);
     encoder->encode(shouldAlwaysUseComplexTextCodePath);
     encoder->encode(iconDatabaseEnabled);
@@ -110 +106 @@
     if (!decoder->decode(parameters.shouldTrackVisitedLinks))
         return false;
-    if (!decoder->decode(parameters.clearResourceCaches))
-        return false;
-    if (!decoder->decode(parameters.clearApplicationCache))
-        return false;
     if (!decoder->decode(parameters.shouldAlwaysUseComplexTextCodePath))
         return false;

trunk/Source/WebKit2/Shared/WebProcessCreationParameters.h

@@ -65 +65 @@
     CacheModel cacheModel;
     bool shouldTrackVisitedLinks;
-    
-    bool clearResourceCaches;
-    bool clearApplicationCache;
 
     bool shouldAlwaysUseComplexTextCodePath;

trunk/Source/WebKit2/UIProcess/API/C/WKAPICast.h

@@ -38 +38 @@
 #include "WKPreferencesPrivate.h"
 #include "WKProtectionSpaceTypes.h"
+#include "WKResourceCacheManager.h"
 #include "WKSharedAPICast.h"
 #include <WebCore/CookieJar.h>
@@ -247 +248 @@
 {
     switch (wkResourceCachesToClear) {
-    case kWKAllResourceCaches:
+    case WKResourceCachesToClearAll:
         return AllResourceCaches;
-    case kWKInMemoryResourceCachesOnly:
+    case WKResourceCachesToClearInMemoryOnly:
         return InMemoryResourceCachesOnly;
     }

trunk/Source/WebKit2/UIProcess/API/C/WKContext.cpp

@@ -149 +149 @@
 }
 
-void WKContextClearResourceCaches(WKContextRef contextRef, WKResourceCachesToClear cachesToClear)
-{
-    toImpl(contextRef)->clearResourceCaches(toResourceCachesToClear(cachesToClear));
-}
-
-void WKContextClearApplicationCache(WKContextRef contextRef)
-{
-    toImpl(contextRef)->clearApplicationCache();
-}
-
 WKCookieManagerRef WKContextGetCookieManager(WKContextRef contextRef)
 {

trunk/Source/WebKit2/UIProcess/API/C/WKContext.h

@@ -39 +39 @@
 };
 typedef uint32_t WKCacheModel;
-
-enum {
-    kWKAllResourceCaches = 0,
-    kWKInMemoryResourceCachesOnly = 1
-};
-typedef uint32_t WKResourceCachesToClear;
 
 // Injected Bundle Client
@@ -126 +120 @@
 WK_EXPORT WKCacheModel WKContextGetCacheModel(WKContextRef context);
 
-WK_EXPORT void WKContextClearResourceCaches(WKContextRef context, WKResourceCachesToClear cachesToClear);
-WK_EXPORT void WKContextClearApplicationCache(WKContextRef context);
-
 WK_EXPORT void WKContextStartMemorySampler(WKContextRef context, WKDoubleRef interval);
 WK_EXPORT void WKContextStopMemorySampler(WKContextRef context);

trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.cpp

@@ -42 +42 @@
 }
 
-void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManagerRef, WKSecurityOriginRef originRef)
+void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManagerRef, WKSecurityOriginRef originRef, WKResourceCachesToClear cachesToClear)
 {
-    toImpl(cacheManagerRef)->clearCacheForOrigin(toImpl(originRef));
+    toImpl(cacheManagerRef)->clearCacheForOrigin(toImpl(originRef), toResourceCachesToClear(cachesToClear));
 }
 
-void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManagerRef)
+void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManagerRef, WKResourceCachesToClear cachesToClear)
 {
-    toImpl(cacheManagerRef)->clearCacheForAllOrigins();    
+    toImpl(cacheManagerRef)->clearCacheForAllOrigins(toResourceCachesToClear(cachesToClear));
 }

trunk/Source/WebKit2/UIProcess/API/C/WKResourceCacheManager.h

@@ -33 +33 @@
 #endif
 
+enum {
+    WKResourceCachesToClearAll = 0,
+    WKResourceCachesToClearInMemoryOnly = 1
+};
+typedef uint32_t WKResourceCachesToClear;
+
 WK_EXPORT WKTypeID WKResourceCacheManagerGetTypeID();
 
@@ -38 +44 @@
 WK_EXPORT void WKResourceCacheManagerGetCacheOrigins(WKResourceCacheManagerRef contextRef, void* context, WKResourceCacheManagerGetCacheOriginsFunction function);
 
-WK_EXPORT void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManger, WKSecurityOriginRef origin);
-WK_EXPORT void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager);
+WK_EXPORT void WKResourceCacheManagerClearCacheForOrigin(WKResourceCacheManagerRef cacheManger, WKSecurityOriginRef origin, WKResourceCachesToClear cachesToClear);
+WK_EXPORT void WKResourceCacheManagerClearCacheForAllOrigins(WKResourceCacheManagerRef cacheManager, WKResourceCachesToClear cachesToClear);
 
 #ifdef __cplusplus

trunk/Source/WebKit2/UIProcess/WebContext.cpp

@@ -112 +112 @@
     , m_alwaysUsesComplexTextCodePath(false)
     , m_cacheModel(CacheModelDocumentViewer)
-    , m_clearResourceCachesForNewWebProcess(false)
-    , m_clearApplicationCacheForNewWebProcess(false)
     , m_memorySamplerEnabled(false)
     , m_memorySamplerInterval(1400.0)
@@ -236 +234 @@
     parameters.databaseDirectory = databaseDirectory();
     parameters.localStorageDirectory = localStorageDirectory();
-    parameters.clearResourceCaches = m_clearResourceCachesForNewWebProcess;
-    parameters.clearApplicationCache = m_clearApplicationCacheForNewWebProcess;
 #if PLATFORM(MAC)
     parameters.presenterApplicationPid = getpid();
 #endif
-
-    m_clearResourceCachesForNewWebProcess = false;
-    m_clearApplicationCacheForNewWebProcess = false;
     
     copyToVector(m_schemesToRegisterAsEmptyDocument, parameters.urlSchemesRegistererdAsEmptyDocument);
@@ -673 +666 @@
 }
 
-void WebContext::clearResourceCaches(ResourceCachesToClear cachesToClear)
-{
-    if (sendToAllProcesses(Messages::WebProcess::ClearResourceCaches(cachesToClear)))
-        return;
-
-    if (cachesToClear == InMemoryResourceCachesOnly)
-        return;
-
-    // FIXME <rdar://problem/8727879>: Setting this flag ensures that the next time a WebProcess is created, this request to
-    // clear the resource cache will be respected. But if the user quits the application before another WebProcess is created,
-    // their request will be ignored.
-    m_clearResourceCachesForNewWebProcess = true;
-}
-
-void WebContext::clearApplicationCache()
-{
-    if (sendToAllProcesses(Messages::WebProcess::ClearApplicationCache()))
-        return;
-
-    // FIXME <rdar://problem/8727879>: Setting this flag ensures that the next time a WebProcess is created, this request to
-    // clear the application cache will be respected. But if the user quits the application before another WebProcess is created,
-    // their request will be ignored.
-    m_clearApplicationCacheForNewWebProcess = true;
-}
-   
 void WebContext::setEnhancedAccessibility(bool flag)
 {

trunk/Source/WebKit2/UIProcess/WebContext.h

@@ -123 +123 @@
     void setCacheModel(CacheModel);
     CacheModel cacheModel() const { return m_cacheModel; }
-    void clearResourceCaches(ResourceCachesToClear);
-    void clearApplicationCache();
 
     void setDefaultRequestTimeoutInterval(double);
@@ -237 +235 @@
     WebDownloadClient m_downloadClient;
     HashMap<uint64_t, RefPtr<DownloadProxy> > m_downloads;
-
-    bool m_clearResourceCachesForNewWebProcess;
-    bool m_clearApplicationCacheForNewWebProcess;
     
     bool m_memorySamplerEnabled;

trunk/Source/WebKit2/UIProcess/WebFullScreenManagerProxy.cpp

@@ -32 +32 @@
 #include "WebFullScreenManagerMessages.h"
 #include "WebFullScreenManagerProxyMessages.h"
-#include "WebProcess.h"
 
 namespace WebKit {

trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.cpp

@@ -79 +79 @@
 }
 
-void WebResourceCacheManagerProxy::clearCacheForOrigin(WebSecurityOrigin* origin)
+void WebResourceCacheManagerProxy::clearCacheForOrigin(WebSecurityOrigin* origin, ResourceCachesToClear cachesToClear)
 {
     SecurityOriginData securityOrigin;
@@ -86 +86 @@
     securityOrigin.port = origin->port();
 
-    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForOrigin(securityOrigin));
+    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForOrigin(securityOrigin, cachesToClear));
 }
 
-void WebResourceCacheManagerProxy::clearCacheForAllOrigins()
+void WebResourceCacheManagerProxy::clearCacheForAllOrigins(ResourceCachesToClear cachesToClear)
 {
-    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForAllOrigins());
+    m_webContext->sendToAllProcessesRelaunchingThemIfNecessary(Messages::WebResourceCacheManager::ClearCacheForAllOrigins(cachesToClear));
 }
 

trunk/Source/WebKit2/UIProcess/WebResourceCacheManagerProxy.h

@@ -30 +30 @@
 #include "Arguments.h"
 #include "GenericCallback.h"
+#include "ResourceCachesToClear.h"
 #include <wtf/HashMap.h>
 #include <wtf/PassRefPtr.h>
@@ -59 +60 @@
 
     void getCacheOrigins(PassRefPtr<ArrayCallback>);
-    void clearCacheForOrigin(WebSecurityOrigin*);
-    void clearCacheForAllOrigins();
+    void clearCacheForOrigin(WebSecurityOrigin*, ResourceCachesToClear);
+    void clearCacheForAllOrigins(ResourceCachesToClear);
 
     void didReceiveWebResourceCacheManagerProxyMessage(CoreIPC::Connection*, CoreIPC::MessageID, CoreIPC::ArgumentDecoder*);

trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.cpp

@@ -29 +29 @@
 #include "Connection.h"
 #include "MessageID.h"
+#include "ResourceCachesToClear.h"
 #include "SecurityOriginData.h"
 #include "WebCoreArgumentCoders.h"
@@ -97 +98 @@
 }
 
-void WebResourceCacheManager::clearCacheForOrigin(SecurityOriginData originData) const
+void WebResourceCacheManager::clearCacheForOrigin(SecurityOriginData originData, uint32_t cachesToClear) const
 {
+    ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
+
     RefPtr<SecurityOrigin> origin = SecurityOrigin::create(originData.protocol, originData.host, originData.port);
     if (!origin)
@@ -106 +109 @@
 
 #if USE(CFURLCACHE)
-    RetainPtr<CFMutableArrayRef> hostArray(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
-    RetainPtr<CFStringRef> host(AdoptCF, origin->host().createCFString());
-    CFArrayAppendValue(hostArray.get(), host.get());
+    if (resourceCachesToClear != InMemoryResourceCachesOnly) { 
+        RetainPtr<CFMutableArrayRef> hostArray(AdoptCF, CFArrayCreateMutable(0, 0, &kCFTypeArrayCallBacks));
+        RetainPtr<CFStringRef> host(AdoptCF, origin->host().createCFString());
+        CFArrayAppendValue(hostArray.get(), host.get());
 
-    clearCFURLCacheForHostNames(hostArray.get());
+        clearCFURLCacheForHostNames(hostArray.get());
+    }
 #endif
     WebProcess::shared().terminateIfPossible();
 }
 
-void WebResourceCacheManager::clearCacheForAllOrigins() const
+void WebResourceCacheManager::clearCacheForAllOrigins(uint32_t cachesToClear) const
 {
-    WebProcess::shared().clearResourceCaches();
+    ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
+
+    WebProcess::shared().clearResourceCaches(resourceCachesToClear);
     WebProcess::shared().terminateIfPossible();
 }

trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.h

@@ -28 +28 @@
 
 #include "Arguments.h"
+#include "ResourceCachesToClear.h"
 #include <wtf/Noncopyable.h>
 #include <wtf/RetainPtr.h>
@@ -57 +58 @@
 
     void getCacheOrigins(uint64_t callbackID) const;
-    void clearCacheForOrigin(SecurityOriginData origin) const;
-    void clearCacheForAllOrigins() const;
+    void clearCacheForOrigin(SecurityOriginData, uint32_t cachesToClear) const;
+    void clearCacheForAllOrigins(uint32_t cachesToClear) const;
 
 #if USE(CFURLCACHE)

trunk/Source/WebKit2/WebProcess/ResourceCache/WebResourceCacheManager.messages.in

@@ -23 +23 @@
 messages -> WebResourceCacheManager {
     void GetCacheOrigins(uint64_t callbackID)
-    void ClearCacheForOrigin(WebKit::SecurityOriginData originIdentifier)
-    void ClearCacheForAllOrigins()
+    void ClearCacheForOrigin(WebKit::SecurityOriginData originIdentifier, uint32_t cachesToClear)
+    void ClearCacheForAllOrigins(uint32_t cachesToClear)
 }

trunk/Source/WebKit2/WebProcess/WebProcess.cpp

@@ -215 +215 @@
     for (size_t i = 0; i < parameters.mimeTypesWithCustomRepresentation.size(); ++i)
         m_mimeTypesWithCustomRepresentations.add(parameters.mimeTypesWithCustomRepresentation[i]);
-
-    if (parameters.clearResourceCaches)
-        clearResourceCaches();
-    if (parameters.clearApplicationCache)
-        clearApplicationCache();
     
 #if PLATFORM(MAC)
@@ -703 +698 @@
 }
 
-void WebProcess::clearResourceCaches(uint32_t cachesToClear)
-{
-    ResourceCachesToClear resourceCachesToClear = static_cast<ResourceCachesToClear>(cachesToClear);
-
+void WebProcess::clearResourceCaches(ResourceCachesToClear resourceCachesToClear)
+{
     platformClearResourceCaches(resourceCachesToClear);
 

trunk/Source/WebKit2/WebProcess/WebProcess.h

@@ -120 +120 @@
     WebGeolocationManager& geolocationManager() { return m_geolocationManager; }
 
-    void clearResourceCaches(uint32_t cachesToClear = AllResourceCaches);
+    void clearResourceCaches(ResourceCachesToClear = AllResourceCaches);
     
     const String& localStorageDirectory() const { return m_localStorageDirectory; }

trunk/Source/WebKit2/WebProcess/WebProcess.messages.in

@@ -51 +51 @@
     ClearPluginSiteData(Vector<WTF::String> pluginPaths, Vector<WTF::String> sites, uint64_t flags, uint64_t maxAgeInSeconds, uint64_t callbackID)
 #endif
-
-    ClearResourceCaches(uint32_t cachesToClear);
-    ClearApplicationCache();
     
     void StartMemorySampler(WebKit::SandboxExtension::Handle sampleLogFileHandle, WTF::String sampleLogFilePath, double interval);
@@ -60 +57 @@
     # Downloads. This should really be in a Download.messages.in, but it seemed unnecessary to create a new file just for
     # two messages.
-    void DownloadRequest(uint64_t downloadID, uint64_t initiatingPageID, WebCore::ResourceRequest request)
+    DownloadRequest(uint64_t downloadID, uint64_t initiatingPageID, WebCore::ResourceRequest request)
     CancelDownload(uint64_t downloadID)
 

trunk/Tools/ChangeLog

@@ +1 @@
+2011-04-04  Sam Weinig  <sam@webkit.org>
+
+        Reviewed by Brian Weinstein.
+
+        Remove duplicate API from WKContext
+        <rdar://problem/8727879>
+        https://bugs.webkit.org/show_bug.cgi?id=57815
+
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebKit2/SendingMessagesToTheWebProcessBeforeItIsValid.cpp: Removed.
+        * TestWebKitAPI/win/TestWebKitAPI.vcproj:
+        Remove SendingMessagesToTheWebProcessBeforeItIsValid since the API it was testing is now removed.
+
 2011-04-04  Tony Chang  <tony@chromium.org>
 

trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj

@@ -58 +58 @@
                 C0BD669D131D3CF700E18F2A /* ResponsivenessTimerDoesntFireEarly.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0BD669C131D3CF700E18F2A /* ResponsivenessTimerDoesntFireEarly.cpp */; };
                 C0BD669F131D3CFF00E18F2A /* ResponsivenessTimerDoesntFireEarly_Bundle.cpp in Sources */ = {isa = PBXBuildFile; fileRef = C0BD669E131D3CFF00E18F2A /* ResponsivenessTimerDoesntFireEarly_Bundle.cpp */; };
-                F6C59E38132AC5E000176C09 /* SendingMessagesToTheWebProcessBeforeItIsValid.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6C59E37132AC5DF00176C09 /* SendingMessagesToTheWebProcessBeforeItIsValid.cpp */; };
                 F6F3F29113342FEB00A6BF19 /* CookieManager.cpp in Sources */ = {isa = PBXBuildFile; fileRef = F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */; };
 /* End PBXBuildFile section */
@@ -162 +161 @@
                 C0BD669C131D3CF700E18F2A /* ResponsivenessTimerDoesntFireEarly.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResponsivenessTimerDoesntFireEarly.cpp; sourceTree = "<group>"; };
                 C0BD669E131D3CFF00E18F2A /* ResponsivenessTimerDoesntFireEarly_Bundle.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ResponsivenessTimerDoesntFireEarly_Bundle.cpp; sourceTree = "<group>"; };
-                F6C59E37132AC5DF00176C09 /* SendingMessagesToTheWebProcessBeforeItIsValid.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SendingMessagesToTheWebProcessBeforeItIsValid.cpp; sourceTree = "<group>"; };
                 F6F3F29013342FEB00A6BF19 /* CookieManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = CookieManager.cpp; sourceTree = "<group>"; };
 /* End PBXFileReference section */
@@ -290 +288 @@
                                 C0BD669E131D3CFF00E18F2A /* ResponsivenessTimerDoesntFireEarly_Bundle.cpp */,
                                 C0ADBE8212FCA6AA00D2C129 /* RestoreSessionStateContainingFormData.cpp */,
-                                F6C59E37132AC5DF00176C09 /* SendingMessagesToTheWebProcessBeforeItIsValid.cpp */,
                                 C02B77F1126612140026BF0F /* SpacebarScrolling.cpp */,
                                 BC7B619A1299FE9E00D174A4 /* WKPreferences.cpp */,
@@ -445 +442 @@
                                 4BFDFFA9131477770061F24B /* HitTestResultNodeHandle.cpp in Sources */,
                                 C0BD669D131D3CF700E18F2A /* ResponsivenessTimerDoesntFireEarly.cpp in Sources */,
-                                F6C59E38132AC5E000176C09 /* SendingMessagesToTheWebProcessBeforeItIsValid.cpp in Sources */,
                                 BC246D8E132F115A00B56D7C /* AboutBlankLoad.cpp in Sources */,
                                 BC246D9A132F1FE100B56D7C /* CanHandleRequest.cpp in Sources */,

trunk/Tools/TestWebKitAPI/win/TestWebKitAPI.vcproj

@@ -490 +490 @@
                                 <File
                                         RelativePath="..\Tests\WebKit2\RestoreSessionStateContainingFormData.cpp"
-                                        >
-                                </File>
-                                <File
-                                        RelativePath="..\Tests\WebKit2\SendingMessagesToTheWebProcessBeforeItIsValid.cpp"
                                         >
                                 </File>