diff options
author | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-06 03:01:51 +0200 |
---|---|---|
committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2020-07-10 01:34:54 +0200 |
commit | 493ae7a6bb0c3ad50615db0090e7ae8d391bc327 (patch) | |
tree | 9f60f522f1ff9dde6a8131d155654f4d47b37fd0 /vcl/opengl | |
parent | 005f5db47b8e1bbd7ebddee92009be072e835fd5 (diff) |
replace usage of blacklist with denylist
.. and a few cases of instead doing blacklist->excludelist where that
made more sense.
Background and motivation:
https://tools.ietf.org/html/draft-knodel-terminology-02
[API CHANGE] officecfg::Office::Canvas::DeviceBlacklist -> DeviceDenylist
[API CHANGE] officecfg::Office::Canvas::BlacklistCurrentDevice -> DenylistCurrentDevice
[API CHANGE] officecfg::Office::Common::Misc::OpenCLBlackList -> OpenCLDenyList
Change-Id: Ia35e25496bf0cc0692d5de4cb66bfc232d3a869e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/98180
Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'vcl/opengl')
-rw-r--r-- | vcl/opengl/README.opengl | 2 | ||||
-rw-r--r-- | vcl/opengl/opengl_denylist_windows.xml (renamed from vcl/opengl/opengl_blacklist_windows.xml) | 4 | ||||
-rw-r--r-- | vcl/opengl/win/WinDeviceInfo.cxx | 6 | ||||
-rw-r--r-- | vcl/opengl/x11/X11DeviceInfo.cxx | 4 |
4 files changed, 8 insertions, 8 deletions
diff --git a/vcl/opengl/README.opengl b/vcl/opengl/README.opengl index 231abbf36500..ad5f31c9e5a8 100644 --- a/vcl/opengl/README.opengl +++ b/vcl/opengl/README.opengl @@ -7,7 +7,7 @@ Environment variables used: SAL_USE_VCLPLUGIN - use the specified VCL plugin (GTK2 in this case - currently needed on Linux because the default GTK3 doesn't support OpenGL yet) -SAL_FORCEGL - enable OpenGL even if the card is blacklisted. +SAL_FORCEGL - enable OpenGL even if the card is whitelisted. Other variables: diff --git a/vcl/opengl/opengl_blacklist_windows.xml b/vcl/opengl/opengl_denylist_windows.xml index 71e562fa97b7..7419be7c5d8b 100644 --- a/vcl/opengl/opengl_blacklist_windows.xml +++ b/vcl/opengl/opengl_denylist_windows.xml @@ -20,7 +20,7 @@ <root> <whitelist> </whitelist> - <blacklist> + <denylist> <entry os="all" vendor="intel" compare="less" version="10.18.14.4264"> <device id="all"/> </entry> @@ -63,5 +63,5 @@ <entry os="all" vendor="microsoft" compare="less" version="6.2.0.0"> <!-- 6.2.0.0 --> <device id="all"/> </entry> - </blacklist> + </denylist> </root> diff --git a/vcl/opengl/win/WinDeviceInfo.cxx b/vcl/opengl/win/WinDeviceInfo.cxx index 9ea39abd8b43..8464b7c5fece 100644 --- a/vcl/opengl/win/WinDeviceInfo.cxx +++ b/vcl/opengl/win/WinDeviceInfo.cxx @@ -166,17 +166,17 @@ WinOpenGLDeviceInfo::~WinOpenGLDeviceInfo() { } -static OUString getBlacklistFile() +static OUString getDenylistFile() { OUString url("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER); rtl::Bootstrap::expandMacros(url); - return url + "/opengl/opengl_blacklist_windows.xml"; + return url + "/opengl/opengl_denylist_windows.xml"; } bool WinOpenGLDeviceInfo::FindBlocklistedDeviceInList() { - return DriverBlocklist::IsDeviceBlocked( getBlacklistFile(), maDriverVersion, maAdapterVendorID, maAdapterDeviceID); + return DriverBlocklist::IsDeviceBlocked( getDenylistFile(), maDriverVersion, maAdapterVendorID, maAdapterDeviceID); } namespace { diff --git a/vcl/opengl/x11/X11DeviceInfo.cxx b/vcl/opengl/x11/X11DeviceInfo.cxx index 7f671952f0fe..b75c22012380 100644 --- a/vcl/opengl/x11/X11DeviceInfo.cxx +++ b/vcl/opengl/x11/X11DeviceInfo.cxx @@ -134,7 +134,7 @@ void X11OpenGLDeviceInfo::GetData() glx::glxtest_pipe = 0; // bytesread < 0 would mean that the above read() call failed. - // This should never happen. If it did, the outcome would be to blacklist anyway. + // This should never happen. If it did, the outcome would be to denylist anyway. if (bytesread < 0) bytesread = 0; @@ -163,7 +163,7 @@ void X11OpenGLDeviceInfo::GetData() // Bug moz#718629 // ECHILD happens when the glxtest process got reaped got reaped after a PR_CreateProcess // as per bug moz#227246. This shouldn't matter, as we still seem to get the data - // from the pipe, and if we didn't, the outcome would be to blacklist anyway. + // from the pipe, and if we didn't, the outcome would be to denylist anyway. waiting_for_glxtest_process_failed = (waitpid_errno != ECHILD); } } |