Diff
Modified: trunk/Source/WebKit/mac/ChangeLog (175782 => 175783)
--- trunk/Source/WebKit/mac/ChangeLog 2014-11-09 01:01:22 UTC (rev 175782)
+++ trunk/Source/WebKit/mac/ChangeLog 2014-11-09 03:17:02 UTC (rev 175783)
@@ -1,3 +1,14 @@
+2014-11-08 Alexey Proskuryakov <a...@apple.com>
+
+ Delete cookies between tests
+ https://bugs.webkit.org/show_bug.cgi?id=138528
+
+ Reviewed by Sam Weinig.
+
+ * WebView/WebPreferences.mm: (+[WebPreferences _clearNetworkLoaderSession]):
+ * WebView/WebPreferencesPrivate.h:
+ Added an SPI for DumpRenderTree.
+
2014-11-07 Eric Carlson <eric.carl...@apple.com>
[iOS] Update optimized fullscreen media controls
Modified: trunk/Source/WebKit/mac/WebView/WebPreferences.mm (175782 => 175783)
--- trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-11-09 01:01:22 UTC (rev 175782)
+++ trunk/Source/WebKit/mac/WebView/WebPreferences.mm 2014-11-09 03:17:02 UTC (rev 175783)
@@ -43,6 +43,7 @@
#import <WebCore/ApplicationCacheStorage.h>
#import <WebCore/AudioSession.h>
#import <WebCore/NetworkStorageSession.h>
+#import <WebCore/PlatformCookieJar.h>
#import <WebCore/ResourceHandle.h>
#import <WebCore/TextEncodingRegistry.h>
#import <runtime/InitializeThreading.h>
@@ -1732,6 +1733,11 @@
NetworkStorageSession::switchToNewTestingSession();
}
++ (void)_clearNetworkLoaderSession
+{
+ WebCore::deleteAllCookies(NetworkStorageSession::defaultStorageSession());
+}
+
+ (void)_setCurrentNetworkLoaderSessionCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)policy
{
WKSetHTTPCookieAcceptPolicy(NetworkStorageSession::defaultStorageSession().cookieStorage().get(), policy);
Modified: trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h (175782 => 175783)
--- trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-11-09 01:01:22 UTC (rev 175782)
+++ trunk/Source/WebKit/mac/WebView/WebPreferencesPrivate.h 2014-11-09 03:17:02 UTC (rev 175783)
@@ -314,6 +314,7 @@
// For DumpRenderTree use only.
+ (void)_switchNetworkLoaderToNewTestingSession;
+ (void)_setCurrentNetworkLoaderSessionCookieAcceptPolicy:(NSHTTPCookieAcceptPolicy)cookieAcceptPolicy;
++ (void)_clearNetworkLoaderSession;
+ (void)setWebKitLinkTimeVersion:(int)version;
Modified: trunk/Tools/ChangeLog (175782 => 175783)
--- trunk/Tools/ChangeLog 2014-11-09 01:01:22 UTC (rev 175782)
+++ trunk/Tools/ChangeLog 2014-11-09 03:17:02 UTC (rev 175783)
@@ -1,3 +1,20 @@
+2014-11-08 Alexey Proskuryakov <a...@apple.com>
+
+ Delete cookies between tests
+ https://bugs.webkit.org/show_bug.cgi?id=138528
+
+ Reviewed by Sam Weinig.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm:
+ (resetWebPreferencesToConsistentValues):
+ * WebKitTestRunner/TestController.cpp:
+ (WTR::TestController::resetPreferencesToConsistentValues):
+ Do it.
+
+ * WebKitTestRunner/InjectedBundle/InjectedBundle.cpp:
+ (WTR::InjectedBundle::beginTesting):
+ Added a FIXME.
+
2014-11-08 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Run layout tests using the network process
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (175782 => 175783)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-11-09 01:01:22 UTC (rev 175782)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2014-11-09 03:17:02 UTC (rev 175783)
@@ -899,6 +899,7 @@
[preferences setMediaSourceEnabled:YES];
#endif
+ [WebPreferences _clearNetworkLoaderSession];
[WebPreferences _setCurrentNetworkLoaderSessionCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
}
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp (175782 => 175783)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-11-09 01:01:22 UTC (rev 175782)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/InjectedBundle.cpp 2014-11-09 03:17:02 UTC (rev 175783)
@@ -254,7 +254,7 @@
WKBundleSetAllowFileAccessFromFileURLs(m_bundle, m_pageGroup, true);
WKBundleSetPluginsEnabled(m_bundle, m_pageGroup, true);
WKBundleSetPopupBlockingEnabled(m_bundle, m_pageGroup, false);
- WKBundleSetAlwaysAcceptCookies(m_bundle, false);
+ WKBundleSetAlwaysAcceptCookies(m_bundle, false); // FIXME: Do this from UI process, so that Networking process gets the preference, too.
WKBundleSetSerialLoadingEnabled(m_bundle, false);
WKBundleSetCacheModel(m_bundle, 1 /*CacheModelDocumentBrowser*/);
Modified: trunk/Tools/WebKitTestRunner/TestController.cpp (175782 => 175783)
--- trunk/Tools/WebKitTestRunner/TestController.cpp 2014-11-09 01:01:22 UTC (rev 175782)
+++ trunk/Tools/WebKitTestRunner/TestController.cpp 2014-11-09 03:17:02 UTC (rev 175783)
@@ -35,6 +35,7 @@
#include <WebKit/WKAuthenticationDecisionListener.h>
#include <WebKit/WKContextConfigurationRef.h>
#include <WebKit/WKContextPrivate.h>
+#include <WebKit/WKCookieManager.h>
#include <WebKit/WKCredential.h>
#include <WebKit/WKIconDatabase.h>
#include <WebKit/WKNotification.h>
@@ -588,7 +589,9 @@
#endif
WKPreferencesSetAcceleratedDrawingEnabled(preferences, m_shouldUseAcceleratedDrawing);
-
+
+ WKCookieManagerDeleteAllCookies(WKContextGetCookieManager(m_context.get()));
+
platformResetPreferencesToConsistentValues();
}
