PawletOS/cromite
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Temp use PREVIEW for IDCompositionDevice5: Temporarily restore the statement from v141 while waiting to update the Windows SDK.

Browse Source 
See "Remove preview usage of DynamicTexture DComp APIs" bugid 6902339
This commit is contained in:
Carmelo Messina
2025-10-29 17:54:25 +01:00
parent af12a65ed4
commit bdb2a4ef22
2 changed files with 77 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/cromite_patches_list.txt
+1
View File
@@ -319,6 +319,7 @@ Temp-disable-experimental-web-platform-features.patch
Block-leakage-of-urls-in-sandbox-iframes.patch
Fix-chromium-build-bugs.patch
Try-to-fix-2082.patch
Temp-use-PREVIEW-for-IDCompositionDevice5.patch
# adblock patches
eyeo-133.0.6943.49-base.patch
build/patches/Temp-use-PREVIEW-for-IDCompositionDevice5.patch
+76
View File
@@ -0,0 +1,76 @@
From: uazo <uazo@users.noreply.github.com>
Date: Wed, 29 Oct 2025 12:30:49 +0000
Subject: Temp use PREVIEW for IDCompositionDevice5
Temporarily restore the statement from v141 while waiting to update the Windows SDK.
See Remove preview usage of DynamicTexture DComp APIs.
https://chromium-review.googlesource.com/c/chromium/src/+/6902339
License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
---
.../viz/service/display_embedder/skia_output_device_dcomp.cc | 3 ++-
ui/gl/dc_layer_tree.cc | 3 ++-
ui/gl/dc_layer_tree.h | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/components/viz/service/display_embedder/skia_output_device_dcomp.cc b/components/viz/service/display_embedder/skia_output_device_dcomp.cc
--- a/components/viz/service/display_embedder/skia_output_device_dcomp.cc
+++ b/components/viz/service/display_embedder/skia_output_device_dcomp.cc
@@ -26,6 +26,7 @@
#include "gpu/command_buffer/service/shared_image/shared_image_representation.h"
#include "gpu/command_buffer/service/skia_utils.h"
#include "gpu/command_buffer/service/texture_manager.h"
+#include "third_party/microsoft_dxheaders/src/include/composition/dcomp-preview.h"
#include "third_party/skia/include/core/SkCanvas.h"
#include "third_party/skia/include/core/SkSurface.h"
#include "third_party/skia/include/gpu/ganesh/GrDirectContext.h"
@@ -56,7 +57,7 @@ OutputSurface::DCSupportLevel GetDcSupportLevel() {
Microsoft::WRL::ComPtr<IDCompositionDevice3> dcomp_device =
gl::GetDirectCompositionDevice();
- if (Microsoft::WRL::ComPtr<IDCompositionDevice5> dcomp_device5;
+ if (Microsoft::WRL::ComPtr<PREVIEW_IDCompositionDevice5> dcomp_device5;
SUCCEEDED(dcomp_device.As(&dcomp_device5))) {
return OutputSurface::DCSupportLevel::kDCompDynamicTexture;
}
diff --git a/ui/gl/dc_layer_tree.cc b/ui/gl/dc_layer_tree.cc
--- a/ui/gl/dc_layer_tree.cc
+++ b/ui/gl/dc_layer_tree.cc
@@ -17,6 +17,7 @@
#include "base/trace_event/trace_event.h"
#include "base/types/expected.h"
#include "base/types/expected_macros.h"
+#include "third_party/microsoft_dxheaders/src/include/composition/dcomp-preview.h"
#include "ui/gfx/color_space_win.h"
#include "ui/gfx/geometry/rect_conversions.h"
#include "ui/gfx/geometry/transform_util.h"
@@ -384,7 +385,7 @@ void DCLayerTree::Initialize(
hdr_metadata_helper_ = std::make_unique<HDRMetadataHelperWin>(d3d11_device_);
- if (Microsoft::WRL::ComPtr<IDCompositionDevice5> dcomp_device5;
+ if (Microsoft::WRL::ComPtr<PREVIEW_IDCompositionDevice5> dcomp_device5;
SUCCEEDED(dcomp_device_.As(&dcomp_device5))) {
hr = dcomp_device5->CreateDynamicTexture(&primary_plane_surface_);
if (FAILED(hr)) {
diff --git a/ui/gl/dc_layer_tree.h b/ui/gl/dc_layer_tree.h
--- a/ui/gl/dc_layer_tree.h
+++ b/ui/gl/dc_layer_tree.h
@@ -18,6 +18,7 @@
#include "base/moving_window.h"
#include "base/types/expected.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
+#include "third_party/microsoft_dxheaders/src/include/composition/dcomp-preview.h"
#include "ui/gfx/geometry/size.h"
#include "ui/gfx/overlay_layer_id.h"
#include "ui/gl/dc_layer_overlay_params.h"
@@ -555,7 +556,7 @@ class GL_EXPORT DCLayerTree {
// If supported, a surface that is updated with the contents of the primary
// plane. If not supported, null.
- Microsoft::WRL::ComPtr<IDCompositionDynamicTexture> primary_plane_surface_;
+ Microsoft::WRL::ComPtr<PREVIEW_IDCompositionDynamicTexture> primary_plane_surface_;
// This is a number that increments once every time `primary_plane_surface_`
// is updated, and is used to determine when the contents have changed so
--