Changeset 224827 in webkit

Timestamp:

Nov 14, 2017, 11:50:30 AM (7 years ago)

Author:

achristensen@apple.com

Message:

Remove assertions added in r224791
​https://bugs.webkit.org/show_bug.cgi?id=178751#c10

• NetworkProcess/mac/RemoteNetworkingContext.mm:

(WebKit::RemoteNetworkingContext::ensureWebsiteDataStoreSession):

• WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:

(WebKit::WebFrameNetworkingContext::ensureWebsiteDataStoreSession):
I had added assertions that sandbox extension handle consumption succeeds.
In the API test IndexedDB.StructuredCloneBackwardCompatibility we get a sandbox extension handle
to give access to a directory that does not exist and consumption fails. We want it to fail,
so my optimistic addition of a success assertion was incorrect. The test passes without it
and behaves like it used to.

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• NetworkProcess/mac/RemoteNetworkingContext.mm (modified) (1 diff)
• WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm (modified) (1 diff)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2017-11-14  Alex Christensen  <achristensen@webkit.org>
+
+        Remove assertions added in r224791
+        https://bugs.webkit.org/show_bug.cgi?id=178751#c10
+
+        * NetworkProcess/mac/RemoteNetworkingContext.mm:
+        (WebKit::RemoteNetworkingContext::ensureWebsiteDataStoreSession):
+        * WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm:
+        (WebKit::WebFrameNetworkingContext::ensureWebsiteDataStoreSession):
+        I had added assertions that sandbox extension handle consumption succeeds.
+        In the API test IndexedDB.StructuredCloneBackwardCompatibility we get a sandbox extension handle
+        to give access to a directory that does not exist and consumption fails.  We want it to fail,
+        so my optimistic addition of a success assertion was incorrect.  The test passes without it
+        and behaves like it used to.
+
 2017-11-14  Tim Horton  <timothy_horton@apple.com>
 

trunk/Source/WebKit/NetworkProcess/mac/RemoteNetworkingContext.mm

@@ -94 +94 @@
         base = SessionTracker::getIdentifierBase();
 
-    if (!sessionID.isEphemeral()) {
-        bool result = SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
-        ASSERT_UNUSED(result, result);
-    }
+    if (!sessionID.isEphemeral())
+        SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
 
     RetainPtr<CFHTTPCookieStorageRef> uiProcessCookieStorage;

trunk/Source/WebKit/WebProcess/WebCoreSupport/mac/WebFrameNetworkingContext.mm

@@ -59 +59 @@
         base = SessionTracker::getIdentifierBase();
 
-    if (!sessionID.isEphemeral()) {
-        bool result = SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
-        ASSERT_UNUSED(result, result);
-    }
+    if (!sessionID.isEphemeral())
+        SandboxExtension::consumePermanently(parameters.cookieStoragePathExtensionHandle);
 
     RetainPtr<CFHTTPCookieStorageRef> uiProcessCookieStorage;