2011-05-11 Sheriff Bot <webkit.review.bot@gmail.com>
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 May 2011 21:25:43 +0000 (21:25 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 11 May 2011 21:25:43 +0000 (21:25 +0000)
        Unreviewed, rolling out r86255.
        http://trac.webkit.org/changeset/86255
        https://bugs.webkit.org/show_bug.cgi?id=60660

        REGRESSION (r86255): Lots of tests crashing in
        CFWriteStreamCreateWithAllocatedBuffers on Windows 7 Release
        (WebKit2 Tests) (Requested by aroben on #webkit).

        * platform/network/ResourceHandle.h:
        * platform/network/cf/CookieStorageCFNet.cpp:
        (WebCore::currentCookieStorage):
        (WebCore::defaultCookieStorage):
        * platform/network/cf/ResourceHandleCFNet.cpp:
        (WebCore::willSendRequest):
        (WebCore::makeFinalRequest):
        (WebCore::ResourceHandle::willSendRequest):
        * platform/network/cf/ResourceRequestCFNet.cpp:
        (WebCore::ResourceRequest::doUpdatePlatformRequest):
2011-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r86255.
        http://trac.webkit.org/changeset/86255
        https://bugs.webkit.org/show_bug.cgi?id=60660

        REGRESSION (r86255): Lots of tests crashing in
        CFWriteStreamCreateWithAllocatedBuffers on Windows 7 Release
        (WebKit2 Tests) (Requested by aroben on #webkit).

        * WebView.cpp:
        (WebView::setCacheModel):
2011-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r86255.
        http://trac.webkit.org/changeset/86255
        https://bugs.webkit.org/show_bug.cgi?id=60660

        REGRESSION (r86255): Lots of tests crashing in
        CFWriteStreamCreateWithAllocatedBuffers on Windows 7 Release
        (WebKit2 Tests) (Requested by aroben on #webkit).

        * Shared/WebProcessCreationParameters.cpp:
        (WebKit::WebProcessCreationParameters::encode):
        (WebKit::WebProcessCreationParameters::decode):
        * Shared/WebProcessCreationParameters.h:
        * Shared/win/WebCoreArgumentCodersWin.cpp:
        (CoreIPC::decodeResourceRequest):
        * UIProcess/win/WebContextWin.cpp:
        (WebKit::WebContext::platformInitializeWebProcess):
        * WebProcess/WebPage/win/WebPageWin.cpp:
        (WebKit::cachedResponseForURL):
        * WebProcess/win/WebProcessWin.cpp:
        (WebKit::WebProcess::platformSetCacheModel):
        (WebKit::WebProcess::platformClearResourceCaches):
        (WebKit::WebProcess::platformInitializeWebProcess):
2011-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>

        Unreviewed, rolling out r86255.
        http://trac.webkit.org/changeset/86255
        https://bugs.webkit.org/show_bug.cgi?id=60660

        REGRESSION (r86255): Lots of tests crashing in
        CFWriteStreamCreateWithAllocatedBuffers on Windows 7 Release
        (WebKit2 Tests) (Requested by aroben on #webkit).

        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
        * win/lib/WebKitSystemInterface.lib:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@86271 268f45cc-cd09-0410-ab3c-d52691b4dbfc

17 files changed:
Source/WebCore/ChangeLog
Source/WebCore/platform/network/ResourceHandle.h
Source/WebCore/platform/network/cf/CookieStorageCFNet.cpp
Source/WebCore/platform/network/cf/ResourceHandleCFNet.cpp
Source/WebCore/platform/network/cf/ResourceRequestCFNet.cpp
Source/WebKit/win/ChangeLog
Source/WebKit/win/WebView.cpp
Source/WebKit2/ChangeLog
Source/WebKit2/Shared/WebProcessCreationParameters.cpp
Source/WebKit2/Shared/WebProcessCreationParameters.h
Source/WebKit2/Shared/win/WebCoreArgumentCodersWin.cpp
Source/WebKit2/UIProcess/win/WebContextWin.cpp
Source/WebKit2/WebProcess/WebPage/win/WebPageWin.cpp
Source/WebKit2/WebProcess/win/WebProcessWin.cpp
WebKitLibraries/ChangeLog
WebKitLibraries/win/include/WebKitSystemInterface/WebKitSystemInterface.h
WebKitLibraries/win/lib/WebKitSystemInterface.lib

index fd0b80136cb7ce74f013b95f74a35d81e018e8b1..d1dc1f342afc18ad37f9a903c4fbcb69c5afd08a 100644 (file)
@@ -1,3 +1,24 @@
+2011-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r86255.
+        http://trac.webkit.org/changeset/86255
+        https://bugs.webkit.org/show_bug.cgi?id=60660
+
+        REGRESSION (r86255): Lots of tests crashing in
+        CFWriteStreamCreateWithAllocatedBuffers on Windows 7 Release
+        (WebKit2 Tests) (Requested by aroben on #webkit).
+
+        * platform/network/ResourceHandle.h:
+        * platform/network/cf/CookieStorageCFNet.cpp:
+        (WebCore::currentCookieStorage):
+        (WebCore::defaultCookieStorage):
+        * platform/network/cf/ResourceHandleCFNet.cpp:
+        (WebCore::willSendRequest):
+        (WebCore::makeFinalRequest):
+        (WebCore::ResourceHandle::willSendRequest):
+        * platform/network/cf/ResourceRequestCFNet.cpp:
+        (WebCore::ResourceRequest::doUpdatePlatformRequest):
+
 2011-05-11  Sam Weinig  <sam@webkit.org>
 
         Reviewed by Eric Seidel.
index 6ca150948c82fae0da4a62981661ca4adcd7154d..d82a9e4d759c2ea6382808d6bf0d8b183fdc17fc 100644 (file)
@@ -194,12 +194,7 @@ public:
     static void setPrivateBrowsingEnabled(bool);
     static CFURLStorageSessionRef privateBrowsingStorageSession();
     static void setPrivateBrowsingStorageSessionIdentifierBase(const String&);
-    static CFURLStorageSessionRef currentStorageSession();
-#if PLATFORM(WIN)
-    static void setDefaultStorageSession(CFURLStorageSessionRef);
-    static CFURLStorageSessionRef defaultStorageSession();
-#endif // PLATFORM(WIN)
-#endif // USE(CFURLSTORAGESESSIONS)
+#endif
 
     using RefCounted<ResourceHandle>::ref;
     using RefCounted<ResourceHandle>::deref;
index f8d5ee3183c774515b560e20b93695af4cd66aaa..3aa52152164a89e761dd3413b542831723717862 100644 (file)
@@ -62,23 +62,13 @@ RetainPtr<CFHTTPCookieStorageRef>& privateBrowsingCookieStorage()
 
 #if USE(CFNETWORK)
 
-static RetainPtr<CFHTTPCookieStorageRef>& defaultSessionCookieStorage()
-{
-    DEFINE_STATIC_LOCAL(RetainPtr<CFHTTPCookieStorageRef>, cookieStorage, ());
-#if USE(CFURLSTORAGESESSIONS) && PLATFORM(WIN)
-    if (!cookieStorage && ResourceHandle::defaultStorageSession())
-        cookieStorage.adoptCF(wkCopyHTTPCookieStorage(ResourceHandle::defaultStorageSession()));
-#endif
-    return cookieStorage;
-}
-
 CFHTTPCookieStorageRef currentCookieStorage()
 {
     ASSERT(isMainThread());
 
     if (CFHTTPCookieStorageRef cookieStorage = privateBrowsingCookieStorage().get())
         return cookieStorage;
-    return defaultCookieStorage();
+    return wkGetDefaultHTTPCookieStorage();
 }
 
 void setCurrentCookieStorage(CFHTTPCookieStorageRef cookieStorage)
@@ -107,8 +97,6 @@ void setCookieStoragePrivateBrowsingEnabled(bool enabled)
 
 CFHTTPCookieStorageRef defaultCookieStorage()
 {
-    if (CFHTTPCookieStorageRef defaultCookieStorage = defaultSessionCookieStorage().get())
-        return defaultCookieStorage;
     return wkGetDefaultHTTPCookieStorage();
 }
 
index 3f590d184e90ab567a3f675d57b41dc3e9364e1d..4678dfe91a4ecba9620b20a5394424da1de92ebb 100644 (file)
@@ -148,9 +148,6 @@ CFURLRequestRef willSendRequest(CFURLConnectionRef conn, CFURLRequestRef cfReque
             RetainPtr<CFStringRef> newMethod(AdoptCF, CFURLRequestCopyHTTPRequestMethod(cfRequest));
             if (CFStringCompareWithOptions(lastHTTPMethod.get(), newMethod.get(), CFRangeMake(0, CFStringGetLength(lastHTTPMethod.get())), kCFCompareCaseInsensitive)) {
                 RetainPtr<CFMutableURLRequestRef> mutableRequest(AdoptCF, CFURLRequestCreateMutableCopy(0, cfRequest));
-#if USE(CFURLSTORAGESESSIONS)
-                wkSetRequestStorageSession(ResourceHandle::currentStorageSession(), mutableRequest.get());
-#endif
                 CFURLRequestSetHTTPRequestMethod(mutableRequest.get(), lastHTTPMethod.get());
 
                 FormData* body = handle->firstRequest().httpBody();
@@ -343,8 +340,10 @@ CFArrayRef arrayFromFormData(const FormData& d)
 static CFURLRequestRef makeFinalRequest(const ResourceRequest& request, bool shouldContentSniff)
 {
     CFMutableURLRequestRef newRequest = CFURLRequestCreateMutableCopy(kCFAllocatorDefault, request.cfURLRequest());
+
 #if USE(CFURLSTORAGESESSIONS)
-    wkSetRequestStorageSession(ResourceHandle::currentStorageSession(), newRequest);
+    if (CFURLStorageSessionRef storageSession = ResourceHandle::privateBrowsingStorageSession())
+        wkSetRequestStorageSession(storageSession, newRequest);
 #endif
     
     if (!shouldContentSniff)
@@ -494,7 +493,8 @@ void ResourceHandle::willSendRequest(ResourceRequest& request, const ResourceRes
         request.clearHTTPAuthorization();
 
 #if USE(CFURLSTORAGESESSIONS)
-     request.setStorageSession(ResourceHandle::currentStorageSession());
+    if (CFURLStorageSessionRef storageSession = privateBrowsingStorageSession())
+        request.setStorageSession(storageSession);
 #endif
 
     client()->willSendRequest(this, request, redirectResponse);
@@ -744,38 +744,7 @@ String ResourceHandle::privateBrowsingStorageSessionIdentifierDefaultBase()
     return String(reinterpret_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleIdentifierKey)));
 }
 
-CFURLStorageSessionRef ResourceHandle::currentStorageSession()
-{
-    if (CFURLStorageSessionRef privateStorageSession = privateBrowsingStorageSession())
-        return privateStorageSession;
-#if PLATFORM(WIN)
-    return defaultStorageSession();
-#else
-    return 0;
 #endif
-}
-
-#if PLATFORM(WIN)
-
-static RetainPtr<CFURLStorageSessionRef>& defaultCFURLStorageSession()
-{
-    DEFINE_STATIC_LOCAL(RetainPtr<CFURLStorageSessionRef>, storageSession, ());
-    return storageSession;
-}
-
-void ResourceHandle::setDefaultStorageSession(CFURLStorageSessionRef storageSession)
-{
-    defaultCFURLStorageSession().adoptCF(storageSession);
-}
-
-CFURLStorageSessionRef ResourceHandle::defaultStorageSession()
-{
-    return defaultCFURLStorageSession().get();
-}
-
-#endif // PLATFORM(WIN)
-
-#endif // USE(CFURLSTORAGESESSIONS)
 
 void WebCoreSynchronousLoaderClient::willSendRequest(ResourceHandle* handle, ResourceRequest& request, const ResourceResponse& /*redirectResponse*/)
 {
index 374ab85c38fd8568e7790199c4a4266aa7901ade..e90ab4fe0c95f3da3aec59c320e4af64d7ada4f7 100644 (file)
@@ -26,7 +26,6 @@
 #include "config.h"
 #include "ResourceRequestCFNet.h"
 
-#include "ResourceHandle.h"
 #include "ResourceRequest.h"
 
 #if PLATFORM(MAC)
@@ -124,11 +123,9 @@ void ResourceRequest::doUpdatePlatformRequest()
         CFURLRequestSetMainDocumentURL(cfRequest, firstPartyForCookies.get());
         CFURLRequestSetCachePolicy(cfRequest, (CFURLRequestCachePolicy)cachePolicy());
         CFURLRequestSetTimeoutInterval(cfRequest, timeoutInterval());
-    } else
+    } else {
         cfRequest = CFURLRequestCreateMutable(0, url.get(), (CFURLRequestCachePolicy)cachePolicy(), timeoutInterval(), firstPartyForCookies.get());
-#if USE(CFURLSTORAGESESSIONS)
-    wkSetRequestStorageSession(ResourceHandle::currentStorageSession(), cfRequest);
-#endif
+    }
 
     RetainPtr<CFStringRef> requestMethod(AdoptCF, httpMethod().createCFString());
     CFURLRequestSetHTTPRequestMethod(cfRequest, requestMethod.get());
index 6cbefb39ab4c98a1fb520347a7586167c18422e8..122cf29d8da6234798f07e9bf0f1e160872f3fdb 100644 (file)
@@ -1,3 +1,16 @@
+2011-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r86255.
+        http://trac.webkit.org/changeset/86255
+        https://bugs.webkit.org/show_bug.cgi?id=60660
+
+        REGRESSION (r86255): Lots of tests crashing in
+        CFWriteStreamCreateWithAllocatedBuffers on Windows 7 Release
+        (WebKit2 Tests) (Requested by aroben on #webkit).
+
+        * WebView.cpp:
+        (WebView::setCacheModel):
+
 2011-05-11  Jessie Berlin  <jberlin@apple.com>
 
         Reviewed by Steve Falkenburg.
index 41f1ef5a0a2fdb8e30030cc29ea7ce7159af3228..89815f9b6699d58efbb83b46a62f36b7fc2e5f5f 100644 (file)
@@ -452,7 +452,7 @@ void WebView::setCacheModel(WebCacheModel cacheModel)
         return;
 
     RetainPtr<CFURLCacheRef> cfurlCache(AdoptCF, CFURLCacheCopySharedURLCache());
-    RetainPtr<CFStringRef> cfurlCacheDirectory(AdoptCF, wkCopyFoundationCacheDirectory(0));
+    RetainPtr<CFStringRef> cfurlCacheDirectory(AdoptCF, wkCopyFoundationCacheDirectory());
     if (!cfurlCacheDirectory)
         cfurlCacheDirectory.adoptCF(WebCore::localUserSpecificStorageDirectory().createCFString());
 
index 25db5eaa7dd385e8a7feb8943a3b0caee1a32bba..a6ba4832b8601d7e3dfd1e7e0308e44395b0cc1a 100644 (file)
@@ -1,3 +1,28 @@
+2011-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r86255.
+        http://trac.webkit.org/changeset/86255
+        https://bugs.webkit.org/show_bug.cgi?id=60660
+
+        REGRESSION (r86255): Lots of tests crashing in
+        CFWriteStreamCreateWithAllocatedBuffers on Windows 7 Release
+        (WebKit2 Tests) (Requested by aroben on #webkit).
+
+        * Shared/WebProcessCreationParameters.cpp:
+        (WebKit::WebProcessCreationParameters::encode):
+        (WebKit::WebProcessCreationParameters::decode):
+        * Shared/WebProcessCreationParameters.h:
+        * Shared/win/WebCoreArgumentCodersWin.cpp:
+        (CoreIPC::decodeResourceRequest):
+        * UIProcess/win/WebContextWin.cpp:
+        (WebKit::WebContext::platformInitializeWebProcess):
+        * WebProcess/WebPage/win/WebPageWin.cpp:
+        (WebKit::cachedResponseForURL):
+        * WebProcess/win/WebProcessWin.cpp:
+        (WebKit::WebProcess::platformSetCacheModel):
+        (WebKit::WebProcess::platformClearResourceCaches):
+        (WebKit::WebProcess::platformInitializeWebProcess):
+
 2011-05-11  Adam Roben  <aroben@apple.com>
 
         Don't notify the plugin when a targeted javascript: URL request completes
index fd350b68730fab0bec19efc949e68ecbd84dbd9b..f29ef1ae04e1129287343a7fda6fc84b9745fb9f 100644 (file)
@@ -27,9 +27,6 @@
 #include "WebProcessCreationParameters.h"
 
 #include "ArgumentCoders.h"
-#if USE(CFURLSTORAGESESSIONS) && PLATFORM(WIN)
-#include "ArgumentCodersCF.h"
-#endif
 
 namespace WebKit {
 
@@ -82,9 +79,6 @@ void WebProcessCreationParameters::encode(CoreIPC::ArgumentEncoder* encoder) con
     encoder->encode(cfURLCacheDiskCapacity);
     encoder->encode(cfURLCacheMemoryCapacity);
     encoder->encode(initialHTTPCookieAcceptPolicy);
-#if USE(CFURLSTORAGESESSIONS)
-    CoreIPC::encode(encoder, serializedDefaultStorageSession.get());
-#endif // USE(CFURLSTORAGESESSIONS)
 #endif
 }
 
@@ -155,10 +149,6 @@ bool WebProcessCreationParameters::decode(CoreIPC::ArgumentDecoder* decoder, Web
         return false;
     if (!decoder->decode(parameters.initialHTTPCookieAcceptPolicy))
         return false;
-#if USE(CFURLSTORAGESESSIONS)
-    if (!CoreIPC::decode(decoder, parameters.serializedDefaultStorageSession))
-        return false;
-#endif // USE(CFURLSTORAGESESSIONS)
 #endif
 
     return true;
index e00ca55690b12add3ea85e8a0ea3932282854c2a..62ceaf9ce0763be9744b447795d4d9cae686bb66 100644 (file)
@@ -29,7 +29,6 @@
 #include "CacheModel.h"
 #include "SandboxExtension.h"
 #include "TextCheckerState.h"
-#include <wtf/RetainPtr.h>
 #include <wtf/Vector.h>
 #include <wtf/text/WTFString.h>
 
@@ -104,11 +103,7 @@ struct WebProcessCreationParameters {
     uint32_t initialHTTPCookieAcceptPolicy;
 
     bool shouldPaintNativeControls;
-
-#if USE(CFURLSTORAGESESSIONS)
-    RetainPtr<CFDataRef> serializedDefaultStorageSession;
-#endif // USE(CFURLSTORAGESESSIONS)
-#endif // PLATFORM(WIN)
+#endif
 };
 
 } // namespace WebKit
index 2d9defd27f5bab869ae4620ebc78b28e0c3e390b..d659ac45c80f6a8a8e0bb4dbe25aa88e031d2dce 100644 (file)
@@ -29,9 +29,7 @@
 #if USE(CFNETWORK)
 #include "ArgumentCodersCF.h"
 #include "PlatformCertificateInfo.h"
-#include <CFNetwork/CFURLRequestPriv.h>
 #include <WebCore/CertificateCFWin.h>
-#include <WebCore/ResourceHandle.h>
 #include <WebKitSystemInterface/WebKitSystemInterface.h>
 #endif
 
@@ -72,13 +70,8 @@ bool decodeResourceRequest(ArgumentDecoder* decoder, WebCore::ResourceRequest& r
     CFURLRequestRef cfURLRequest = wkCFURLRequestCreateFromSerializableRepresentation(dictionary.get(), CoreIPC::tokenNullTypeRef());
     if (!cfURLRequest)
         return false;
-    CFMutableURLRequestRef mutableCFURLRequest = CFURLRequestCreateMutableCopy(0, cfURLRequest);
-    CFRelease(cfURLRequest);
-#if USE(CFURLSTORAGESESSIONS)
-    wkSetRequestStorageSession(WebCore::ResourceHandle::currentStorageSession(), mutableCFURLRequest);
-#endif
 
-    resourceRequest = WebCore::ResourceRequest(mutableCFURLRequest);
+    resourceRequest = WebCore::ResourceRequest(cfURLRequest);
     return true;
 #else
     return false;
index 9964de06c72840e48cadddb2f031f968b5a4cba3..c1c2a00e78783d481648eb4bffa994631b3d0338 100644 (file)
@@ -60,7 +60,7 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& para
     parameters.cfURLCacheDiskCapacity = CFURLCacheDiskCapacity(cfurlCache.get());
     parameters.cfURLCacheMemoryCapacity = CFURLCacheMemoryCapacity(cfurlCache.get());
 
-    RetainPtr<CFStringRef> cfURLCachePath(AdoptCF, wkCopyFoundationCacheDirectory(0));
+    RetainPtr<CFStringRef> cfURLCachePath(AdoptCF, wkCopyFoundationCacheDirectory());
     parameters.cfURLCachePath = String(cfURLCachePath.get());
     // Remove the ending '\' (necessary to have CFNetwork find the Cache file).
     ASSERT(parameters.cfURLCachePath.length());
@@ -69,7 +69,6 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& para
 
 #if USE(CFURLSTORAGESESSIONS)
     parameters.uiProcessBundleIdentifier = String(reinterpret_cast<CFStringRef>(CFBundleGetValueForInfoDictionaryKey(CFBundleGetMainBundle(), kCFBundleIdentifierKey)));
-    parameters.serializedDefaultStorageSession.adoptCF(wkCopySerializedDefaultStorageSession());
 #endif // USE(CFURLSTORAGESESSIONS)
 
     parameters.initialHTTPCookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
index 33ea9c87c4d8c4338268903e2a3ef93c5e8d122a..dcf748fbfef49f4477d78d55f1cd969413f8c017 100644 (file)
@@ -267,17 +267,14 @@ static RetainPtr<CFCachedURLResponseRef> cachedResponseForURL(WebPage* webPage,
 {
     RetainPtr<CFURLRef> cfURL(AdoptCF, url.createCFURL());
     RetainPtr<CFMutableURLRequestRef> request(AdoptCF, CFURLRequestCreateMutable(0, cfURL.get(), kCFURLRequestCachePolicyReloadIgnoringCache, 60, 0));
-#if USE(CFURLSTORAGESESSIONS)
-    wkSetRequestStorageSession(ResourceHandle::currentStorageSession(), request.get());
-#endif
 
     RetainPtr<CFStringRef> userAgent(AdoptCF, webPage->userAgent().createCFString());
     CFURLRequestSetHTTPHeaderFieldValue(request.get(), CFSTR("User-Agent"), userAgent.get());
 
     RetainPtr<CFURLCacheRef> cache;
 #if USE(CFURLSTORAGESESSIONS)
-    if (CFURLStorageSessionRef currentStorageSession = ResourceHandle::currentStorageSession())
-        cache.adoptCF(wkCopyURLCache(currentStorageSession));
+    if (CFURLStorageSessionRef storageSession = ResourceHandle::privateBrowsingStorageSession())
+        cache.adoptCF(wkCopyURLCache(storageSession));
     else
 #endif
         cache.adoptCF(CFURLCacheCopySharedURLCache());
index b9c36667c947f295630398723ba9009fc750c4f6..d9a4af547363bcfb73cf635d1643f6f2fdfd0c39 100644 (file)
@@ -32,7 +32,6 @@
 #include <WebCore/FileSystem.h>
 #include <WebCore/MemoryCache.h>
 #include <WebCore/PageCache.h>
-#include <WebCore/ResourceHandle.h>
 #include <WebCore/Settings.h>
 #include <wtf/text/WTFString.h>
 
@@ -70,14 +69,7 @@ static uint64_t volumeFreeSize(CFStringRef cfstringPath)
 void WebProcess::platformSetCacheModel(CacheModel cacheModel)
 {
 #if USE(CFNETWORK)
-    RetainPtr<CFStringRef> cfurlCacheDirectory;
-#if USE(CFURLSTORAGESESSIONS)
-    if (CFURLStorageSessionRef defaultStorageSession = ResourceHandle::defaultStorageSession())
-        cfurlCacheDirectory.adoptCF(wkCopyFoundationCacheDirectory(defaultStorageSession));
-    else
-#endif
-        cfurlCacheDirectory.adoptCF(wkCopyFoundationCacheDirectory(0));
-
+    RetainPtr<CFStringRef> cfurlCacheDirectory(AdoptCF, wkCopyFoundationCacheDirectory());
     if (!cfurlCacheDirectory)
         cfurlCacheDirectory.adoptCF(WebCore::localUserSpecificStorageDirectory().createCFString());
 
@@ -102,14 +94,7 @@ void WebProcess::platformSetCacheModel(CacheModel cacheModel)
     memoryCache()->setDeadDecodedDataDeletionInterval(deadDecodedDataDeletionInterval);
     pageCache()->setCapacity(pageCacheCapacity);
 
-    RetainPtr<CFURLCacheRef> cfurlCache;
-#if USE(CFURLSTORAGESESSIONS)
-    if (CFURLStorageSessionRef defaultStorageSession = ResourceHandle::defaultStorageSession())
-        cfurlCache.adoptCF(wkCopyURLCache(defaultStorageSession));
-    else
-#endif // USE(CFURLSTORAGESESSIONS)
-        cfurlCache.adoptCF(CFURLCacheCopySharedURLCache());
-
+    RetainPtr<CFURLCacheRef> cfurlCache(AdoptCF, CFURLCacheCopySharedURLCache());
     CFURLCacheSetMemoryCapacity(cfurlCache.get(), urlCacheMemoryCapacity);
     CFURLCacheSetDiskCapacity(cfurlCache.get(), max<unsigned long>(urlCacheDiskCapacity, CFURLCacheDiskCapacity(cfurlCache.get()))); // Don't shrink a big disk cache, since that would cause churn.
 #endif
@@ -120,17 +105,8 @@ void WebProcess::platformClearResourceCaches(ResourceCachesToClear cachesToClear
 #if USE(CFNETWORK)
     if (cachesToClear == InMemoryResourceCachesOnly)
         return;
-
-    RetainPtr<CFURLCacheRef> cache;
-#if USE(CFURLSTORAGESESSIONS)
-    if (CFURLStorageSessionRef defaultStorageSession = ResourceHandle::defaultStorageSession())
-        cache.adoptCF(wkCopyURLCache(defaultStorageSession));
-    else
-#endif // USE(CFURLSTORAGESESSIONS)
-        cache.adoptCF(CFURLCacheCopySharedURLCache());
-
-    CFURLCacheRemoveAllCachedResponses(cache.get());
-#endif // USE(CFNETWORK)
+    CFURLCacheRemoveAllCachedResponses(RetainPtr<CFURLCacheRef>(AdoptCF, CFURLCacheCopySharedURLCache()).get());
+#endif
 }
 
 void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters& parameters, CoreIPC::ArgumentDecoder*)
@@ -138,13 +114,6 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
     setShouldPaintNativeControls(parameters.shouldPaintNativeControls);
 
 #if USE(CFNETWORK)
-#if USE(CFURLSTORAGESESSIONS)
-    if (CFURLStorageSessionRef defaultStorageSession = wkDeserializeStorageSession(parameters.serializedDefaultStorageSession.get())) {
-        ResourceHandle::setDefaultStorageSession(defaultStorageSession);
-        return;
-    }
-#endif // USE(CFURLSTORAGESESSIONS)
-
     RetainPtr<CFStringRef> cachePath(AdoptCF, parameters.cfURLCachePath.createCFString());
     if (!cachePath)
         return;
@@ -153,7 +122,7 @@ void WebProcess::platformInitializeWebProcess(const WebProcessCreationParameters
     CFIndex cacheMemoryCapacity = parameters.cfURLCacheMemoryCapacity;
     RetainPtr<CFURLCacheRef> uiProcessCache(AdoptCF, CFURLCacheCreate(kCFAllocatorDefault, cacheMemoryCapacity, cacheDiskCapacity, cachePath.get()));
     CFURLCacheSetSharedURLCache(uiProcessCache.get());
-#endif // USE(CFNETWORK)
+#endif
 
     WebCookieManager::shared().setHTTPCookieAcceptPolicy(parameters.initialHTTPCookieAcceptPolicy);
 }
index 116e12dc4f9641d4a4203b40fc42efda578221dd..7346bc98e8d05eaf195f467b6d179fda19f257ee 100644 (file)
@@ -1,3 +1,16 @@
+2011-05-11  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r86255.
+        http://trac.webkit.org/changeset/86255
+        https://bugs.webkit.org/show_bug.cgi?id=60660
+
+        REGRESSION (r86255): Lots of tests crashing in
+        CFWriteStreamCreateWithAllocatedBuffers on Windows 7 Release
+        (WebKit2 Tests) (Requested by aroben on #webkit).
+
+        * win/include/WebKitSystemInterface/WebKitSystemInterface.h:
+        * win/lib/WebKitSystemInterface.lib:
+
 2011-05-11  Jessie Berlin  <jberlin@apple.com>
 
         Reviewed by Steve Falkenburg.
index 6cf90d8237041bfa5b9ea53c0d4b0fac26b0513e..b2cda98a73e8d4f4bf4a82645b713fb795d442a1 100644 (file)
@@ -93,7 +93,7 @@ void* wkGetSSLCertificateChainContext(CFDictionaryRef);
 CFHTTPCookieStorageRef wkGetDefaultHTTPCookieStorage();
 CFHTTPCookieStorageRef wkCreateInMemoryHTTPCookieStorage();
 void wkSetCFURLRequestShouldContentSniff(CFMutableURLRequestRef, bool);
-CFStringRef wkCopyFoundationCacheDirectory(CFURLStorageSessionRef);
+CFStringRef wkCopyFoundationCacheDirectory();
 void wkSetClientCertificateInSSLProperties(CFMutableDictionaryRef, CFDataRef);
 
 CFArrayRef wkCFURLRequestCopyHTTPRequestBodyParts(CFURLRequestRef);
@@ -103,8 +103,6 @@ CFURLStorageSessionRef wkCreatePrivateStorageSession(CFStringRef identifier);
 void wkSetRequestStorageSession(CFURLStorageSessionRef, CFMutableURLRequestRef);
 CFURLCacheRef wkCopyURLCache(CFURLStorageSessionRef);
 CFHTTPCookieStorageRef wkCopyHTTPCookieStorage(CFURLStorageSessionRef);
-CFDataRef wkCopySerializedDefaultStorageSession();
-CFURLStorageSessionRef wkDeserializeStorageSession(CFDataRef);
 
 CFArrayRef wkCFURLCacheCopyAllHostNamesInPersistentStore();
 void wkCFURLCacheDeleteHostNamesInPersistentStore(CFArrayRef hostNames);
index 82496c5255d8238ea2c316d528d9f6138bf799aa..a33fb2ec0f3ac6a5cc1eab4a21dea2b3f69ac9c2 100644 (file)
Binary files a/WebKitLibraries/win/lib/WebKitSystemInterface.lib and b/WebKitLibraries/win/lib/WebKitSystemInterface.lib differ