REGRESSION (r137432): The /webkit2/WebKitCookieManager/accept-policy unit test is...
authorcommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Dec 2012 11:10:34 +0000 (11:10 +0000)
committercommit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 13 Dec 2012 11:10:34 +0000 (11:10 +0000)
https://bugs.webkit.org/show_bug.cgi?id=104790

Patch by Joaquim Rocha <jrocha@igalia.com> on 2012-12-13
Reviewed by Carlos Garcia Campos.

Source/WebKit2:

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):

Tools:

Unskip the GTK accept policy test.

* Scripts/run-gtk-tests:
(TestRunner):

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

Source/WebKit2/ChangeLog
Source/WebKit2/UIProcess/WebContext.cpp
Source/WebKit2/UIProcess/gtk/WebContextGtk.cpp
Tools/ChangeLog
Tools/Scripts/run-gtk-tests

index 5c15dff..7210f08 100644 (file)
@@ -1,3 +1,21 @@
+2012-12-13  Joaquim Rocha  <jrocha@igalia.com>
+
+        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  <jonlee@apple.com>
 
         plugin snapshotting accepts bad snapshot after 5 seconds
index 3608e6c..c249ad6 100644 (file)
@@ -135,6 +135,9 @@ WebContext::WebContext(ProcessModel processModel, const String& injectedBundlePa
     , m_shouldPaintNativeControls(true)
     , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyAlways)
 #endif
+#if USE(SOUP)
+    , m_initialHTTPCookieAcceptPolicy(HTTPCookieAcceptPolicyOnlyFromMainDocumentDomain)
+#endif
     , m_processTerminationEnabled(true)
 #if ENABLE(NETWORK_PROCESS)
     , m_usesNetworkProcess(false)
index 1a62a14..535020c 100644 (file)
@@ -88,7 +88,8 @@ void WebContext::platformInitializeWebProcess(WebProcessCreationParameters& para
     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()
index 92aeb74..69a5440 100644 (file)
@@ -1,3 +1,15 @@
+2012-12-13  Joaquim Rocha  <jrocha@igalia.com>
+
+        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  <xingnan.wang@intel.com>
 
         Unreviewed. Adding myself to committers list.
index 4a0d4f6..a2273cf 100755 (executable)
@@ -66,7 +66,6 @@ class TestRunner:
         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),