diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-09-05 12:37:36 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-10-17 13:53:46 +0000 |
| commit | 5a424f4a7b188b75da63eb697f63558af0b17f6f (patch) | |
| tree | 54c427fcbc567dac8181ab5fd22d20e72cc51609 /chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc | |
| parent | acbcf08a6dffdfe90a6eaf661fcd6923f0de2447 (diff) | |
BASELINE: Update Chromium to 116.0.5845.183
Change-Id: Iaaf57e02c218c93993a5044c659b63674e2c8a12
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/512320
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc')
| -rw-r--r-- | chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc b/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc index 766e1d97cf4..b8996c83b68 100644 --- a/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc +++ b/chromium/cc/trees/layer_tree_host_unittest_copyrequest.cc @@ -23,8 +23,6 @@ #include "components/viz/service/display/direct_renderer.h" #include "components/viz/test/fake_output_surface.h" #include "components/viz/test/fake_skia_output_surface.h" -#include "components/viz/test/test_gles2_interface.h" -#include "gpu/GLES2/gl2extchromium.h" namespace cc { @@ -538,7 +536,7 @@ class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest std::unique_ptr<TestLayerTreeFrameSink> CreateLayerTreeFrameSink( const viz::RendererSettings& renderer_settings, double refresh_rate, - scoped_refptr<viz::ContextProvider> compositor_context_provider, + scoped_refptr<viz::RasterContextProvider> compositor_context_provider, scoped_refptr<viz::RasterContextProvider> worker_context_provider) override { auto frame_sink = LayerTreeHostCopyRequestTest::CreateLayerTreeFrameSink( @@ -611,7 +609,7 @@ class LayerTreeHostTestHiddenSurfaceNotAllocatedForSubtreeCopyRequest viz::AggregatedRenderPassId parent_render_pass_id; viz::AggregatedRenderPassId copy_layer_render_pass_id; - raw_ptr<TestLayerTreeFrameSink> frame_sink_ = nullptr; + raw_ptr<TestLayerTreeFrameSink, DanglingUntriaged> frame_sink_ = nullptr; bool did_swap_ = false; FakeContentLayerClient client_; scoped_refptr<FakePictureLayer> root_; @@ -1059,7 +1057,7 @@ class LayerTreeHostCopyRequestTestCountSharedImages std::unique_ptr<TestLayerTreeFrameSink> CreateLayerTreeFrameSink( const viz::RendererSettings& renderer_settings, double refresh_rate, - scoped_refptr<viz::ContextProvider> compositor_context_provider, + scoped_refptr<viz::RasterContextProvider> compositor_context_provider, scoped_refptr<viz::RasterContextProvider> worker_context_provider) override { // Since this test counts shared images and SkiaRenderer uses shared images |