Changeset 255865 in webkit

Timestamp:

Feb 5, 2020 3:24:26 PM (4 years ago)

Author:

Patrick Griffis

Message:

[GTK][WPE] Add more fontconfig paths into the sandbox
​https://bugs.webkit.org/show_bug.cgi?id=207293

Reviewed by Michael Catanzaro.

These paths were reported to be used on Debian.

• UIProcess/Launcher/glib/BubblewrapLauncher.cpp:

(WebKit::bindFonts):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Launcher/glib/BubblewrapLauncher.cpp (modified) (3 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2020-02-05  Patrick Griffis  <pgriffis@igalia.com>
+
+        [GTK][WPE] Add more fontconfig paths into the sandbox
+        https://bugs.webkit.org/show_bug.cgi?id=207293
+
+        Reviewed by Michael Catanzaro.
+
+        These paths were reported to be used on Debian.
+
+        * UIProcess/Launcher/glib/BubblewrapLauncher.cpp:
+        (WebKit::bindFonts):
+
 2020-02-05  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebKit/UIProcess/Launcher/glib/BubblewrapLauncher.cpp

@@ -376 +376 @@
     // Configs can include custom dirs but then we have to parse them...
     GUniquePtr<char> fontConfig(g_build_filename(configDir, "fontconfig", nullptr));
+    GUniquePtr<char> fontConfigHome(g_build_filename(homeDir, ".fontconfig", nullptr));
     GUniquePtr<char> fontCache(g_build_filename(cacheDir, "fontconfig", nullptr));
     GUniquePtr<char> fontHomeConfig(g_build_filename(homeDir, ".fonts.conf", nullptr));
@@ -382 +383 @@
     GUniquePtr<char> fontHomeData(g_build_filename(homeDir, ".fonts", nullptr));
     bindIfExists(args, fontConfig.get());
+    bindIfExists(args, fontConfigHome.get());
     bindIfExists(args, fontCache.get(), BindFlags::ReadWrite);
     bindIfExists(args, fontHomeConfig.get());
@@ -387 +389 @@
     bindIfExists(args, fontData.get());
     bindIfExists(args, fontHomeData.get());
+    bindIfExists(args, "/var/cache/fontconfig"); // Used by Debian.
 }