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 | |
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')
-rw-r--r-- | vcl/Library_vcl.mk | 2 | ||||
-rw-r--r-- | vcl/Module_vcl.mk | 4 | ||||
-rw-r--r-- | vcl/Package_opengl_denylist.mk (renamed from vcl/Package_opengl_blacklist.mk) | 6 | ||||
-rw-r--r-- | vcl/Package_skia_denylist.mk (renamed from vcl/Package_skia_blacklist.mk) | 6 | ||||
-rw-r--r-- | vcl/README.vars | 4 | ||||
-rw-r--r-- | vcl/inc/driverblocklist.hxx | 2 | ||||
-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 | ||||
-rw-r--r-- | vcl/qa/cppunit/test_blocklist_evaluate.xml | 4 | ||||
-rw-r--r-- | vcl/qa/cppunit/test_blocklist_parse.xml | 4 | ||||
-rw-r--r-- | vcl/skia/SkiaHelper.cxx | 34 | ||||
-rw-r--r-- | vcl/skia/skia_denylist_vulkan.xml (renamed from vcl/skia/skia_blacklist_vulkan.xml) | 4 | ||||
-rw-r--r-- | vcl/skia/x11/gdiimpl.cxx | 2 | ||||
-rw-r--r-- | vcl/source/helper/driverblocklist.cxx | 12 | ||||
-rw-r--r-- | vcl/source/opengl/OpenGLHelper.cxx | 20 |
17 files changed, 60 insertions, 60 deletions
diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index ac780e92f2b0..75b59b625000 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -610,7 +610,7 @@ $(eval $(call gb_Library_add_exception_objects,vcl,\ # runtime dependency $(eval $(call gb_Library_use_package,vcl,vcl_opengl_shader)) ifeq ($(OS),WNT) -$(eval $(call gb_Library_use_package,vcl,vcl_opengl_blacklist)) +$(eval $(call gb_Library_use_package,vcl,vcl_opengl_denylist)) endif ifeq ($(OS), $(filter LINUX %BSD SOLARIS, $(OS))) diff --git a/vcl/Module_vcl.mk b/vcl/Module_vcl.mk index 31bfa0f65cf6..a0c3e516b6bb 100644 --- a/vcl/Module_vcl.mk +++ b/vcl/Module_vcl.mk @@ -26,9 +26,9 @@ $(eval $(call gb_Module_add_targets,vcl,\ Package_tipoftheday \ UIConfig_vcl \ $(if $(filter WNT,$(OS)), \ - Package_opengl_blacklist ) \ + Package_opengl_denylist ) \ $(if $(filter SKIA,$(BUILD_TYPE)), \ - Package_skia_blacklist ) \ + Package_skia_denylist ) \ $(if $(filter DESKTOP,$(BUILD_TYPE)), \ StaticLibrary_vclmain \ $(if $(ENABLE_MACOSX_SANDBOX),, \ diff --git a/vcl/Package_opengl_blacklist.mk b/vcl/Package_opengl_denylist.mk index 35dbfcb0b273..d5102335f074 100644 --- a/vcl/Package_opengl_blacklist.mk +++ b/vcl/Package_opengl_denylist.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,vcl_opengl_blacklist,$(SRCDIR)/vcl/opengl)) +$(eval $(call gb_Package_Package,vcl_opengl_denylist,$(SRCDIR)/vcl/opengl)) -$(eval $(call gb_Package_add_files,vcl_opengl_blacklist,$(LIBO_SHARE_FOLDER)/opengl,\ - opengl_blacklist_windows.xml \ +$(eval $(call gb_Package_add_files,vcl_opengl_denylist,$(LIBO_SHARE_FOLDER)/opengl,\ + opengl_denylist_windows.xml \ )) # vim: set noet sw=4 ts=4: diff --git a/vcl/Package_skia_blacklist.mk b/vcl/Package_skia_denylist.mk index 611766eb7aa3..70f6ac701697 100644 --- a/vcl/Package_skia_blacklist.mk +++ b/vcl/Package_skia_denylist.mk @@ -7,10 +7,10 @@ # file, You can obtain one at http://mozilla.org/MPL/2.0/. # -$(eval $(call gb_Package_Package,vcl_skia_blacklist,$(SRCDIR)/vcl/skia)) +$(eval $(call gb_Package_Package,vcl_skia_denylist,$(SRCDIR)/vcl/skia)) -$(eval $(call gb_Package_add_files,vcl_skia_blacklist,$(LIBO_SHARE_FOLDER)/skia,\ - skia_blacklist_vulkan.xml \ +$(eval $(call gb_Package_add_files,vcl_skia_denylist,$(LIBO_SHARE_FOLDER)/skia,\ + skia_denylist_vulkan.xml \ )) # vim: set noet sw=4 ts=4: diff --git a/vcl/README.vars b/vcl/README.vars index 35ad1ffe353e..73c982ef7d3f 100644 --- a/vcl/README.vars +++ b/vcl/README.vars @@ -42,8 +42,8 @@ SAL_DISABLE_GLYPH_CACHING - don't render glyphs through OpenGL textures or Skia Skia ---- SAL_DISABLESKIA=1 - force disabled Skia -SAL_ENABLESKIA=1 - enable Skia, unless blacklisted (and if the VCL backend supports Skia) -SAL_FORCESKIA=1 - force using Skia, even if blacklisted +SAL_ENABLESKIA=1 - enable Skia, unless denylisted (and if the VCL backend supports Skia) +SAL_FORCESKIA=1 - force using Skia, even if denylisted SAL_SKIA=raster|vulkan - select Skia's drawing method, by default Vulkan is used SAL_DISABLE_SKIA_CACHE=1 - disable caching of complex images diff --git a/vcl/inc/driverblocklist.hxx b/vcl/inc/driverblocklist.hxx index 8c1747be472f..a3564bd1ab79 100644 --- a/vcl/inc/driverblocklist.hxx +++ b/vcl/inc/driverblocklist.hxx @@ -114,7 +114,7 @@ private: enum class BlockType { WHITELIST, - BLACKLIST, + DENYLIST, UNKNOWN }; 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); } } diff --git a/vcl/qa/cppunit/test_blocklist_evaluate.xml b/vcl/qa/cppunit/test_blocklist_evaluate.xml index 00a8b0439146..7c0527f849ec 100644 --- a/vcl/qa/cppunit/test_blocklist_evaluate.xml +++ b/vcl/qa/cppunit/test_blocklist_evaluate.xml @@ -20,7 +20,7 @@ <root> <whitelist> </whitelist> - <blacklist> + <denylist> <entry os="all" vendor="amd" compare="less" version="10.20.30.40"> <device id="all"/> @@ -34,5 +34,5 @@ <device id="all"/> </entry> - </blacklist> + </denylist> </root> diff --git a/vcl/qa/cppunit/test_blocklist_parse.xml b/vcl/qa/cppunit/test_blocklist_parse.xml index f9af4cb5418e..212e61bd8443 100644 --- a/vcl/qa/cppunit/test_blocklist_parse.xml +++ b/vcl/qa/cppunit/test_blocklist_parse.xml @@ -34,7 +34,7 @@ <device id="all"/> </entry> </whitelist> - <blacklist> + <denylist> <entry os="all" vendor="all" compare="less" version="10.20.30.40"> <device id="all"/> </entry> @@ -59,5 +59,5 @@ <entry os="all"> <device id="all"/> </entry> - </blacklist> + </denylist> </root> diff --git a/vcl/skia/SkiaHelper.cxx b/vcl/skia/SkiaHelper.cxx index 6b04c4300fe4..b7d45ad61196 100644 --- a/vcl/skia/SkiaHelper.cxx +++ b/vcl/skia/SkiaHelper.cxx @@ -45,12 +45,12 @@ bool isVCLSkiaEnabled() { return false; } namespace SkiaHelper { -static OUString getBlacklistFile() +static OUString getDenylistFile() { OUString url("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER); rtl::Bootstrap::expandMacros(url); - return url + "/skia/skia_blacklist_vulkan.xml"; + return url + "/skia/skia_denylist_vulkan.xml"; } static uint32_t driverVersion = 0; @@ -90,7 +90,7 @@ static void writeToLog(SvStream& stream, const char* key, const OUString& value) } // Note that this function also logs system information about Vulkan. -static bool isVulkanBlacklisted(const VkPhysicalDeviceProperties& props) +static bool isVulkanDenylisted(const VkPhysicalDeviceProperties& props) { static const char* const types[] = { "other", "integrated", "discrete", "virtual", "cpu", "??" }; // VkPhysicalDeviceType @@ -125,10 +125,10 @@ static bool isVulkanBlacklisted(const VkPhysicalDeviceProperties& props) << ", vendor: " << vendorIdStr << " (" << vendorAsString(vendorId) << "), device: " << deviceIdStr << ", type: " << deviceType << ", name: " << props.deviceName); - bool blacklisted = DriverBlocklist::IsDeviceBlocked(getBlacklistFile(), driverVersionString, - vendorIdStr, deviceIdStr); - writeToLog(logFile, "Blacklisted", blacklisted ? "yes" : "no"); - return blacklisted; + bool denylisted = DriverBlocklist::IsDeviceBlocked(getDenylistFile(), driverVersionString, + vendorIdStr, deviceIdStr); + writeToLog(logFile, "Denylisted", denylisted ? "yes" : "no"); + return denylisted; } static void writeSkiaRasterInfo() @@ -141,7 +141,7 @@ static void writeSkiaRasterInfo() static sk_app::VulkanWindowContext::SharedGrContext getTemporaryGrContext(); -static void checkDeviceBlacklisted(bool blockDisable = false) +static void checkDeviceDenylisted(bool blockDisable = false) { static bool done = false; if (!done) @@ -167,16 +167,16 @@ static void checkDeviceBlacklisted(bool blockDisable = false) // the temporary context will clean up again. grContext = getTemporaryGrContext(); } - bool blacklisted = true; // assume the worst + bool denylisted = true; // assume the worst if (grContext.getGrContext()) // Vulkan was initialized properly { - blacklisted = isVulkanBlacklisted( + denylisted = isVulkanDenylisted( sk_app::VulkanWindowContext::getPhysDeviceProperties()); - SAL_INFO("vcl.skia", "Vulkan blacklisted: " << blacklisted); + SAL_INFO("vcl.skia", "Vulkan denylisted: " << denylisted); } else SAL_INFO("vcl.skia", "Vulkan could not be initialized"); - if (blacklisted && !blockDisable) + if (denylisted && !blockDisable) { disableRenderMethod(RenderVulkan); writeSkiaRasterInfo(); @@ -186,7 +186,7 @@ static void checkDeviceBlacklisted(bool blockDisable = false) case RenderRaster: SAL_INFO("vcl.skia", "Using Skia raster mode"); writeSkiaRasterInfo(); - return; // software, never blacklisted + return; // software, never denylisted } done = true; } @@ -226,7 +226,7 @@ bool isVCLSkiaEnabled() /* * There are a number of cases that these environment variables cover: - * * SAL_FORCESKIA forces Skia if disabled by UI options or blacklisted + * * SAL_FORCESKIA forces Skia if disabled by UI options or denylisted * * SAL_DISABLESKIA avoids the use of Skia regardless of any option */ @@ -239,8 +239,8 @@ bool isVCLSkiaEnabled() { bRet = true; SkGraphics::Init(); - // don't actually block if blacklisted, but log it if enabled, and also get the vendor id - checkDeviceBlacklisted(true); + // don't actually block if denylisted, but log it if enabled, and also get the vendor id + checkDeviceDenylisted(true); } else if (getenv("SAL_FORCEGL")) { @@ -264,7 +264,7 @@ bool isVCLSkiaEnabled() if (bEnable) { SkGraphics::Init(); - checkDeviceBlacklisted(); // switch to raster if driver is blacklisted + checkDeviceDenylisted(); // switch to raster if driver is denylisted } bRet = bEnable; diff --git a/vcl/skia/skia_blacklist_vulkan.xml b/vcl/skia/skia_denylist_vulkan.xml index 5058012e9485..4c62ca4b04a9 100644 --- a/vcl/skia/skia_blacklist_vulkan.xml +++ b/vcl/skia/skia_denylist_vulkan.xml @@ -20,9 +20,9 @@ <root> <whitelist> </whitelist> - <blacklist> + <denylist> <entry os="all" vendor="intel" compare="less_equal" version="0.16.2"> <device id="all"/> </entry> - </blacklist> + </denylist> </root> diff --git a/vcl/skia/x11/gdiimpl.cxx b/vcl/skia/x11/gdiimpl.cxx index 4754bfc64f95..72b1f9874c5c 100644 --- a/vcl/skia/x11/gdiimpl.cxx +++ b/vcl/skia/x11/gdiimpl.cxx @@ -74,7 +74,7 @@ X11SkiaSalGraphicsImpl::createWindowContext(Display* display, Drawable drawable, // that the X11 visual is always the same. Ensure it is so. static VisualID checkVisualID = -1U; // Exception is for the temporary case during startup, when SkiaHelper's - // checkDeviceBlacklisted() needs a WindowContext and may be called before SalVisual + // checkDeviceDenylisted() needs a WindowContext and may be called before SalVisual // is ready. if (!temporary) { diff --git a/vcl/source/helper/driverblocklist.cxx b/vcl/source/helper/driverblocklist.cxx index 556eb7172fed..09ce2f9b7165 100644 --- a/vcl/source/helper/driverblocklist.cxx +++ b/vcl/source/helper/driverblocklist.cxx @@ -376,7 +376,7 @@ void Parser::handleEntry(DriverInfo& rDriver, xmlreader::XmlReader& rReader) { rDriver.mbWhitelisted = true; } - else if (meBlockType == BlockType::BLACKLIST) + else if (meBlockType == BlockType::DENYLIST) { rDriver.mbWhitelisted = false; } @@ -489,9 +489,9 @@ void Parser::handleContent(xmlreader::XmlReader& rReader) meBlockType = BlockType::WHITELIST; handleList(rReader); } - else if (name == "blacklist") + else if (name == "denylist") { - meBlockType = BlockType::BLACKLIST; + meBlockType = BlockType::DENYLIST; handleList(rReader); } else if (name == "root") @@ -504,7 +504,7 @@ void Parser::handleContent(xmlreader::XmlReader& rReader) } else if (res == xmlreader::XmlReader::Result::End) { - if (name == "whitelist" || name == "blacklist") + if (name == "whitelist" || name == "denylist") { meBlockType = BlockType::UNKNOWN; } @@ -673,7 +673,7 @@ bool FindBlocklistedDeviceInList(std::vector<DriverInfo>& aDeviceInfos, } } - SAL_INFO("vcl.driver", (match ? "blacklisted" : "not blacklisted") << " in " << blocklistURL); + SAL_INFO("vcl.driver", (match ? "denylisted" : "not denylisted") << " in " << blocklistURL); return match; } @@ -684,7 +684,7 @@ bool IsDeviceBlocked(const OUString& blocklistURL, const OUString& driverVersion Parser parser(blocklistURL, driverList); if (!parser.parse()) { - SAL_WARN("vcl.driver", "error parsing blacklist " << blocklistURL); + SAL_WARN("vcl.driver", "error parsing denylist " << blocklistURL); return false; } return FindBlocklistedDeviceInList(driverList, driverVersion, vendorId, deviceId, diff --git a/vcl/source/opengl/OpenGLHelper.cxx b/vcl/source/opengl/OpenGLHelper.cxx index fcc028ebd635..6aeb53af17a4 100644 --- a/vcl/source/opengl/OpenGLHelper.cxx +++ b/vcl/source/opengl/OpenGLHelper.cxx @@ -753,21 +753,21 @@ void OpenGLHelper::checkGLError(const char* pFile, size_t nLine) } } -bool OpenGLHelper::isDeviceBlacklisted() +bool OpenGLHelper::isDeviceDenylisted() { static bool bSet = false; - static bool bBlacklisted = true; // assume the worst + static bool bDenylisted = true; // assume the worst if (!bSet) { OpenGLZone aZone; #if defined UNX && !defined MACOSX && !defined IOS && !defined ANDROID && !defined HAIKU X11OpenGLDeviceInfo aInfo; - bBlacklisted = aInfo.isDeviceBlocked(); - SAL_INFO("vcl.opengl", "blacklisted: " << bBlacklisted); + bDenylisted = aInfo.isDeviceBlocked(); + SAL_INFO("vcl.opengl", "denylisted: " << bDenylisted); #elif defined( _WIN32 ) WinOpenGLDeviceInfo aInfo; - bBlacklisted = aInfo.isDeviceBlocked(); + bDenylisted = aInfo.isDeviceBlocked(); if (DriverBlocklist::GetWindowsVersion() == 0x00060001 && /* Windows 7 */ (aInfo.GetAdapterVendorID() == "0x1002" || aInfo.GetAdapterVendorID() == "0x1022")) /* AMD */ @@ -776,20 +776,20 @@ bool OpenGLHelper::isDeviceBlacklisted() OpenGLZone::relaxWatchdogTimings(); } #else - bBlacklisted = false; + bDenylisted = false; #endif bSet = true; } - return bBlacklisted; + return bDenylisted; } bool OpenGLHelper::supportsVCLOpenGL() { static bool bDisableGL = !!getenv("SAL_DISABLEGL"); - bool bBlacklisted = isDeviceBlacklisted(); + bool bDenylisted = isDeviceDenylisted(); - return !bDisableGL && !bBlacklisted; + return !bDisableGL && !bDenylisted; } namespace @@ -950,7 +950,7 @@ bool OpenGLHelper::isVCLOpenGLEnabled() /* * There are a number of cases that these environment variables cover: * * SAL_FORCEGL forces OpenGL independent of any other option - * * SAL_DISABLEGL or a blacklisted driver avoid the use of OpenGL if SAL_FORCEGL is not set + * * SAL_DISABLEGL or a denylisted driver avoid the use of OpenGL if SAL_FORCEGL is not set */ bSet = true; |