From 03561cae90f1d99b5c54b1ef3be69f10e882b25e Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Fri, 12 Mar 2021 09:13:00 +0100 Subject: BASELINE: Update Chromium to 88.0.4324.208 Change-Id: I3ae87d23e4eff4b4a469685658740a213600c667 Reviewed-by: Allan Sandfeld Jensen --- chromium/media/gpu/vaapi/vaapi_picture_tfp.cc | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'chromium/media/gpu/vaapi/vaapi_picture_tfp.cc') diff --git a/chromium/media/gpu/vaapi/vaapi_picture_tfp.cc b/chromium/media/gpu/vaapi/vaapi_picture_tfp.cc index a571b4b2b41..7b604f19f33 100644 --- a/chromium/media/gpu/vaapi/vaapi_picture_tfp.cc +++ b/chromium/media/gpu/vaapi/vaapi_picture_tfp.cc @@ -8,7 +8,6 @@ #include "media/gpu/vaapi/vaapi_wrapper.h" #include "ui/base/ui_base_features.h" #include "ui/gfx/x/connection.h" -#include "ui/gfx/x/x11_types.h" #include "ui/gl/gl_bindings.h" #include "ui/gl/gl_image_glx.h" #include "ui/gl/scoped_binders.h" @@ -35,7 +34,7 @@ VaapiTFPPicture::VaapiTFPPicture( client_texture_id, texture_target), connection_(x11::Connection::Get()), - x_pixmap_(0) { + x_pixmap_(x11::Pixmap::None) { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); DCHECK(!features::IsUsingOzonePlatform()); DCHECK(texture_id); @@ -49,13 +48,13 @@ VaapiTFPPicture::~VaapiTFPPicture() { DCHECK_EQ(glGetError(), static_cast(GL_NO_ERROR)); } - if (x_pixmap_) - connection_->FreePixmap({static_cast(x_pixmap_)}); + if (x_pixmap_ != x11::Pixmap::None) + connection_->FreePixmap({x_pixmap_}); } Status VaapiTFPPicture::Initialize() { DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_); - DCHECK(x_pixmap_); + DCHECK_NE(x_pixmap_, x11::Pixmap::None); if (make_context_current_cb_ && !make_context_current_cb_.Run()) return StatusCode::kVaapiBadContext; @@ -111,7 +110,7 @@ Status VaapiTFPPicture::Allocate(gfx::BufferFormat format) { DLOG(ERROR) << "Failed creating an X Pixmap for TFP"; return StatusCode::kVaapiNoPixmap; } else { - x_pixmap_ = base::strict_cast<::Pixmap>(pixmap); + x_pixmap_ = pixmap; } return Initialize(); -- cgit v1.2.1