Modified: trunk/Source/WebKit2/ChangeLog (137580 => 137581)
--- trunk/Source/WebKit2/ChangeLog 2012-12-13 11:00:12 UTC (rev 137580)
+++ trunk/Source/WebKit2/ChangeLog 2012-12-13 11:10:34 UTC (rev 137581)
@@ -1,3 +1,21 @@
+2012-12-13 Joaquim Rocha <[email protected]>
+
+ REGRESSION (r137432): The /webkit2/WebKitCookieManager/accept-policy unit test is failing
+ https://bugs.webkit.org/show_bug.cgi?id=104790
+
+ Reviewed by Carlos Garcia Campos.
+
+ The cookies accept policy and the cookies persistent storage type
+ were not being correctly assigned.
+
+ * UIProcess/WebContext.cpp: Set the default value of the cookie
+ accept policy.
+ (WebKit::WebContext::WebContext):
+ * UIProcess/gtk/WebContextGtk.cpp: Fix setting the cookies persistent
+ storage type (it was mistakenly assigning the policy instead) and
+ set the accept policy which was missing.
+ (WebKit::WebContext::platformInitializeWebProcess):
+
2012-12-13 Jon Lee <[email protected]>
plugin snapshotting accepts bad snapshot after 5 seconds
Modified: trunk/Source/WebKit2/UIProcess/WebContext.cpp (137580 => 137581)
--- trunk/Source/WebKit2/UIProcess/WebContext.cpp 2012-12-13 11:00:12 UTC (rev 137580)
+++ trunk/Source/WebKit2/UIProcess/WebContext.cpp 2012-12-13 11:10:34 UTC (rev 137581)
@@ -135,6 +135,9 @@
, m_shouldPaintNativeControls(true)
, m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAlways)
#endif
+#if USE(SOUP)
+ , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
+#endif
, m_processTerminationEnabled(true)
#if ENABLE(NETWORK_PROCESS)
, m_usesNetworkProcess(false)
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp (137580 => 137581)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2012-12-13 11:00:12 UTC (rev 137580)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp 2012-12-13 11:10:34 UTC (rev 137581)
@@ -88,7 +88,8 @@
initInspectorServer();
parameters.urlSchemesRegistered = m_soupRequestManagerProxy->registeredURISchemes();
- m_cookieManagerProxy->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookieAcceptPolicy);
+ m_cookieManagerProxy->getCookiePersistentStorage(parameters.cookiePersistentStoragePath, parameters.cookiePersistentStorageType);
+ parameters.cookieAcceptPolicy = m_initialHTTPCookieAcceptPolicy;
}
void WebContext::platformInvalidateContext()
Modified: trunk/Tools/ChangeLog (137580 => 137581)
--- trunk/Tools/ChangeLog 2012-12-13 11:00:12 UTC (rev 137580)
+++ trunk/Tools/ChangeLog 2012-12-13 11:10:34 UTC (rev 137581)
@@ -1,3 +1,15 @@
+2012-12-13 Joaquim Rocha <[email protected]>
+
+ REGRESSION (r137432): The /webkit2/WebKitCookieManager/accept-policy unit test is failing
+ https://bugs.webkit.org/show_bug.cgi?id=104790
+
+ Reviewed by Carlos Garcia Campos.
+
+ Unskip the GTK accept policy test.
+
+ * Scripts/run-gtk-tests:
+ (TestRunner):
+
2012-12-13 Xingnan Wang <[email protected]>
Unreviewed. Adding myself to committers list.
Modified: trunk/Tools/Scripts/run-gtk-tests (137580 => 137581)
--- trunk/Tools/Scripts/run-gtk-tests 2012-12-13 11:00:12 UTC (rev 137580)
+++ trunk/Tools/Scripts/run-gtk-tests 2012-12-13 11:10:34 UTC (rev 137581)
@@ -66,7 +66,6 @@
SkippedTest("unittests/testwebresource", "/webkit/webresource/loading", "Test fails", 104689),
SkippedTest("unittests/testwebresource", "/webkit/webresource/sub_resource_loading", "Test fails in GTK Linux 64-bit Release bot", 82330),
SkippedTest("unittests/testwebview", "/webkit/webview/icon-uri", "Test times out in GTK Linux 64-bit Release bot", 82328),
- SkippedTest("WebKit2APITests/TestCookieManager", "/webkit2/WebKitCookieManager/accept-policy", "Test is failing", 104790),
SkippedTest("WebKit2APITests/TestResources", "/webkit2/WebKitWebView/resources", "Test is flaky in GTK Linux 32-bit Release bot", 82868),
SkippedTest("WebKit2APITests/TestWebKitAccessibility", "/webkit2/WebKitAccessibility/atspi-basic-hierarchy", "Test fails", 100408),
SkippedTest("WebKit2APITests/TestWebKitFindController", "/webkit2/WebKitFindController/hide", "Test always fails in Xvfb", 89810),
