Remove support_grcontext from Platform::ContextAttributes
All places that set it to true, also set enable_raster_interface to
true (because it's used for raster), but the only remaining place that
uses the field reads it only if enable_raster_interface is false.
So the result is always false.
Bug: 391648152
Change-Id: I715df0c49935a0c8e225d3264ec1ead7a568d4f7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6829270
Reviewed-by: Dave Tapuska <dtapuska@chromium.org>
Commit-Queue: Vasiliy Telezhnikov <vasilyt@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1498821}
diff --git a/content/renderer/renderer_blink_platform_impl.cc b/content/renderer/renderer_blink_platform_impl.cc
index b1e6601..8acfebd9 100644
--- a/content/renderer/renderer_blink_platform_impl.cc
+++ b/content/renderer/renderer_blink_platform_impl.cc
@@ -750,8 +750,7 @@
attributes.enable_raster_interface = web_attributes.enable_raster_interface;
attributes.enable_gpu_rasterization = attributes.enable_raster_interface;
attributes.enable_gles2_interface = !attributes.enable_gpu_rasterization;
- attributes.enable_grcontext =
- !attributes.enable_gpu_rasterization && web_attributes.support_grcontext;
+ attributes.enable_grcontext = false;
attributes.gpu_preference = web_attributes.prefer_low_power_gpu
? gl::GpuPreference::kLowPower
diff --git a/third_party/blink/public/platform/platform.h b/third_party/blink/public/platform/platform.h
index dfc5c935..87aebe19 100644
--- a/third_party/blink/public/platform/platform.h
+++ b/third_party/blink/public/platform/platform.h
@@ -490,12 +490,10 @@
bool fail_if_major_performance_caveat = false;
ContextType context_type = kGLES2ContextType;
- // Offscreen contexts created for WebGL should not need the RasterInterface
- // or GrContext. If either of these are set to false, it will not be
- // possible to use the corresponding interface for the lifetime of the
- // context.
+ // Offscreen contexts created for WebGL should not need the RasterInterface.
+ // If it's set to false, it will not be possible to use the corresponding
+ // interface for the lifetime of the context.
bool enable_raster_interface = false;
- bool support_grcontext = false;
};
struct GraphicsInfo {
unsigned vendor_id = 0;
diff --git a/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc b/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc
index 2f61732..b1c5abf 100644
--- a/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc
+++ b/third_party/blink/renderer/modules/mediarecorder/video_track_recorder.cc
@@ -595,10 +595,6 @@
attributes.enable_raster_interface = true;
attributes.prefer_low_power_gpu = true;
- // TODO(crbug.com/1240756): This line can be removed once OOPR-Canvas has
- // shipped on all platforms
- attributes.support_grcontext = true;
-
Platform::GraphicsInfo info;
encoder_thread_context_ =
VideoTrackRecorderImplContextProvider::CreateOffscreenGraphicsContext(
diff --git a/third_party/blink/renderer/modules/webcodecs/background_readback.cc b/third_party/blink/renderer/modules/webcodecs/background_readback.cc
index f63f595..fbfd59f 100644
--- a/third_party/blink/renderer/modules/webcodecs/background_readback.cc
+++ b/third_party/blink/renderer/modules/webcodecs/background_readback.cc
@@ -329,7 +329,6 @@
return true;
Platform::ContextAttributes attributes;
attributes.enable_raster_interface = true;
- attributes.support_grcontext = true;
attributes.prefer_low_power_gpu = true;
Platform::GraphicsInfo info;
diff --git a/third_party/blink/renderer/platform/graphics/gpu/shared_gpu_context.cc b/third_party/blink/renderer/platform/graphics/gpu/shared_gpu_context.cc
index 3ff8277f..162f161b 100644
--- a/third_party/blink/renderer/platform/graphics/gpu/shared_gpu_context.cc
+++ b/third_party/blink/renderer/platform/graphics/gpu/shared_gpu_context.cc
@@ -97,7 +97,6 @@
Platform::ContextAttributes context_attributes;
context_attributes.enable_raster_interface = true;
- context_attributes.support_grcontext = true;
// The shared GPU context should not trigger a switch to the high-performance
// GPU.
