From a90a5cba08fdf6c0ceb95101c275108a152a3aed Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 12 Jun 2024 07:35:37 +0200 Subject: Merging upstream version 127.0. Signed-off-by: Daniel Baumann --- gfx/webrender_bindings/DCLayerTree.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'gfx/webrender_bindings/DCLayerTree.h') diff --git a/gfx/webrender_bindings/DCLayerTree.h b/gfx/webrender_bindings/DCLayerTree.h index d5ade5781e..8289eaf50d 100644 --- a/gfx/webrender_bindings/DCLayerTree.h +++ b/gfx/webrender_bindings/DCLayerTree.h @@ -44,6 +44,10 @@ struct IDCompositionVirtualSurface; namespace mozilla { +namespace gfx { +color::ColorProfileDesc QueryOutputColorProfile(); +} + namespace gl { class GLContext; } @@ -248,8 +252,6 @@ class DCLayerTree { bool mPendingCommit; - static color::ColorProfileDesc QueryOutputColorProfile(); - mutable Maybe mOutputColorProfile; DCompOverlayTypes mUsedOverlayTypesInFrame = DCompOverlayTypes::NO_OVERLAY; @@ -258,7 +260,7 @@ class DCLayerTree { public: const color::ColorProfileDesc& OutputColorProfile() const { if (!mOutputColorProfile) { - mOutputColorProfile = Some(QueryOutputColorProfile()); + mOutputColorProfile = Some(gfx::QueryOutputColorProfile()); } return *mOutputColorProfile; } -- cgit v1.2.3