Commit d2ef4028 authored by Sean Gilhuly's avatar Sean Gilhuly Committed by Commit Bot

Blacklist -> Blocklist in components/viz

Bug: 1101491
Change-Id: I589575dbf7f2d551770a11e624149d83a9921882
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2366659
Commit-Queue: Sean Gilhuly <sgilhuly@chromium.org>
Reviewed-by: default avatarkylechar <kylechar@chromium.org>
Cr-Commit-Position: refs/heads/master@{#800230}
parent 677d9287
...@@ -103,7 +103,7 @@ class VIZ_COMMON_EXPORT ContextProvider { ...@@ -103,7 +103,7 @@ class VIZ_COMMON_EXPORT ContextProvider {
// provider must have been successfully bound to a thread before calling this. // provider must have been successfully bound to a thread before calling this.
virtual const gpu::Capabilities& ContextCapabilities() const = 0; virtual const gpu::Capabilities& ContextCapabilities() const = 0;
// Returns feature blacklist decisions and driver bug workarounds info. The // Returns feature blocklist decisions and driver bug workarounds info. The
// context provider must have been successfully bound to a thread before // context provider must have been successfully bound to a thread before
// calling this. // calling this.
virtual const gpu::GpuFeatureInfo& GetGpuFeatureInfo() const = 0; virtual const gpu::GpuFeatureInfo& GetGpuFeatureInfo() const = 0;
......
...@@ -107,7 +107,7 @@ class VIZ_COMMON_EXPORT RasterContextProvider { ...@@ -107,7 +107,7 @@ class VIZ_COMMON_EXPORT RasterContextProvider {
// provider must have been successfully bound to a thread before calling this. // provider must have been successfully bound to a thread before calling this.
virtual const gpu::Capabilities& ContextCapabilities() const = 0; virtual const gpu::Capabilities& ContextCapabilities() const = 0;
// Returns feature blacklist decisions and driver bug workarounds info. The // Returns feature blocklist decisions and driver bug workarounds info. The
// context provider must have been successfully bound to a thread before // context provider must have been successfully bound to a thread before
// calling this. // calling this.
virtual const gpu::GpuFeatureInfo& GetGpuFeatureInfo() const = 0; virtual const gpu::GpuFeatureInfo& GetGpuFeatureInfo() const = 0;
......
...@@ -224,9 +224,9 @@ void GpuHostImpl::EstablishGpuChannel(int client_id, ...@@ -224,9 +224,9 @@ void GpuHostImpl::EstablishGpuChannel(int client_id,
shutdown_timeout_.Stop(); shutdown_timeout_.Stop();
// If GPU features are already blacklisted, no need to establish the channel. // If GPU features are already blocklisted, no need to establish the channel.
if (!delegate_->GpuAccessAllowed()) { if (!delegate_->GpuAccessAllowed()) {
DVLOG(1) << "GPU blacklisted, refusing to open a GPU channel."; DVLOG(1) << "GPU access blocked, refusing to open a GPU channel.";
std::move(callback).Run(mojo::ScopedMessagePipeHandle(), gpu::GPUInfo(), std::move(callback).Run(mojo::ScopedMessagePipeHandle(), gpu::GPUInfo(),
gpu::GpuFeatureInfo(), gpu::GpuFeatureInfo(),
EstablishChannelStatus::kGpuAccessDenied); EstablishChannelStatus::kGpuAccessDenied);
...@@ -386,7 +386,7 @@ void GpuHostImpl::OnChannelEstablished( ...@@ -386,7 +386,7 @@ void GpuHostImpl::OnChannelEstablished(
auto callback = std::move(channel_requests_.front()); auto callback = std::move(channel_requests_.front());
channel_requests_.pop(); channel_requests_.pop();
// Currently if any of the GPU features are blacklisted, we don't establish a // Currently if any of the GPU features are blocklisted, we don't establish a
// GPU channel. // GPU channel.
if (channel_handle.is_valid() && !delegate_->GpuAccessAllowed()) { if (channel_handle.is_valid() && !delegate_->GpuAccessAllowed()) {
gpu_service_remote_->CloseChannel(client_id); gpu_service_remote_->CloseChannel(client_id);
......
...@@ -74,7 +74,7 @@ DCLayerResult ValidateYUVQuad( ...@@ -74,7 +74,7 @@ DCLayerResult ValidateYUVQuad(
int current_frame_processed_overlay_count, int current_frame_processed_overlay_count,
DisplayResourceProvider* resource_provider) { DisplayResourceProvider* resource_provider) {
// Note: Do not override this value based on base::Feature values. It is the // Note: Do not override this value based on base::Feature values. It is the
// result after the GPU blacklist has been consulted. // result after the GPU blocklist has been consulted.
if (!has_overlay_support) if (!has_overlay_support)
return DC_LAYER_FAILED_UNSUPPORTED_QUAD; return DC_LAYER_FAILED_UNSUPPORTED_QUAD;
......
...@@ -229,7 +229,7 @@ void TestGpuServiceHolder::InitializeOnGpuThread( ...@@ -229,7 +229,7 @@ void TestGpuServiceHolder::InitializeOnGpuThread(
#endif #endif
} }
// Always enable gpu and oop raster, regardless of platform and blacklist. // Always enable gpu and oop raster, regardless of platform and blocklist.
// The latter instructs GpuChannelManager::GetSharedContextState to create a // The latter instructs GpuChannelManager::GetSharedContextState to create a
// GrContext, which is required by SkiaRenderer as well as OOP-R. // GrContext, which is required by SkiaRenderer as well as OOP-R.
gpu::GPUInfo gpu_info; gpu::GPUInfo gpu_info;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment