commit 0e9c5dadaf7cf2bde0ac707b393c7de82a9859da
author bfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Jun 30 22:01:35 2020 +0000
committer bfulgham@apple.com <bfulgham@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Tue Jun 30 22:01:35 2020 +0000
tree 06ec5e9290cfc3e5e290967eaa0b44cd5bff2b82
parent c8cfe6a197ba034d61fade4d6d0887205b348d7f

Partially revert r257135 now that the underlying bug is resolved
https://bugs.webkit.org/show_bug.cgi?id=213814
<rdar://problem/59859573>

Reviewed by Per Arne Vollan.

This patch is a partial revert of the code change in Bug 208033, where a temporary
workaround was added for a bug in an underlying framework. Now that the bug has been
fixed, we can remove this workaround.

* UIProcess/GPU/GPUProcessProxy.cpp:
(WebKit::gpuProcessSessionParameters):


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

Source/WebKit/ChangeLog

diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
index 8bc463e..c9786e0 100644
--- a/Source/WebKit/ChangeLog
+++ b/Source/WebKit/ChangeLog
@@ -1,5 +1,20 @@
 2020-06-30  Brent Fulgham  <bfulgham@apple.com>
 
+        Partially revert r257135 now that the underlying bug is resolved
+        https://bugs.webkit.org/show_bug.cgi?id=213814
+        <rdar://problem/59859573>
+
+        Reviewed by Per Arne Vollan.
+
+        This patch is a partial revert of the code change in Bug 208033, where a temporary
+        workaround was added for a bug in an underlying framework. Now that the bug has been
+        fixed, we can remove this workaround.
+
+        * UIProcess/GPU/GPUProcessProxy.cpp:
+        (WebKit::gpuProcessSessionParameters):
+
+2020-06-30  Brent Fulgham  <bfulgham@apple.com>
+
         [macOS] Stop blocking two audio-related user client classes
         https://bugs.webkit.org/show_bug.cgi?id=213807
         <rdar://problem/64874902>

Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp

diff --git a/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp b/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp
index 2f845aa..15fe60a 100644
--- a/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp
+++ b/Source/WebKit/UIProcess/GPU/GPUProcessProxy.cpp
@@ -280,13 +280,8 @@
 
     parameters.mediaCacheDirectory = store.resolvedMediaCacheDirectory();
     SandboxExtension::Handle mediaCacheDirectoryExtensionHandle;
-    if (!parameters.mediaCacheDirectory.isEmpty()) {
-        String parentFolder = parameters.mediaCacheDirectory;
-        auto position = parentFolder.reverseFind("/");
-        if (position != notFound)
-            parentFolder = parentFolder.substring(0, position);
-        SandboxExtension::createHandleWithoutResolvingPath(parentFolder, SandboxExtension::Type::ReadWrite, parameters.mediaCacheDirectorySandboxExtensionHandle);
-    }
+    if (!parameters.mediaCacheDirectory.isEmpty())
+        SandboxExtension::createHandleWithoutResolvingPath(parameters.mediaCacheDirectory, SandboxExtension::Type::ReadWrite, parameters.mediaCacheDirectorySandboxExtensionHandle);
 
 #if ENABLE(LEGACY_ENCRYPTED_MEDIA)
     parameters.mediaKeysStorageDirectory = store.resolvedMediaKeysDirectory();