From 0db24532aeb5d2647338e474f47fd2d93b6a3ba9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Emilio=20Cobos=20=C3=81lvarez?= Date: Wed, 8 Jun 2022 19:19:08 +0000 Subject: [PATCH] Bug 1773359 - Remove TRANSPARENT workaround in webrender bindings. r=gfx-reviewers,jrmuizel Differential Revision: https://phabricator.services.mozilla.com/D148679 --- config/windows-h-constant.decls.h | 1 + gfx/webrender_bindings/webrender_ffi.h | 6 ------ 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/config/windows-h-constant.decls.h b/config/windows-h-constant.decls.h index 071d5f48a64e..4fe0e8bd30ec 100644 --- a/config/windows-h-constant.decls.h +++ b/config/windows-h-constant.decls.h @@ -51,6 +51,7 @@ auto READ_CONTROL; auto WRITE_DAC; auto WRITE_OWNER; auto SYNCHRONIZE; +auto TRANSPARENT; auto MAXIMUM_ALLOWED; auto GENERIC_READ; diff --git a/gfx/webrender_bindings/webrender_ffi.h b/gfx/webrender_bindings/webrender_ffi.h index eb79974bdf43..f5370bcaac84 100644 --- a/gfx/webrender_bindings/webrender_ffi.h +++ b/gfx/webrender_bindings/webrender_ffi.h @@ -95,14 +95,8 @@ void omta_sample(mozilla::wr::WrWindowId aWindowId, void omta_deregister_sampler(mozilla::wr::WrWindowId aWindowId); } // extern "C" -// Work-around wingdi.h define which conflcits with WR color constant -#pragma push_macro("TRANSPARENT") -#undef TRANSPARENT - #include "webrender_ffi_generated.h" -#pragma pop_macro("TRANSPARENT") - template struct mozilla::wr::Point2D; template struct mozilla::wr::Point2D; template struct mozilla::wr::Point2D;