summaryrefslogtreecommitdiff
path: root/chromium/media/gpu/windows/dxva_picture_buffer_win.cc
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/media/gpu/windows/dxva_picture_buffer_win.cc')
-rw-r--r--chromium/media/gpu/windows/dxva_picture_buffer_win.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chromium/media/gpu/windows/dxva_picture_buffer_win.cc b/chromium/media/gpu/windows/dxva_picture_buffer_win.cc
index 0a3075e49d8..6ee71c3ccbc 100644
--- a/chromium/media/gpu/windows/dxva_picture_buffer_win.cc
+++ b/chromium/media/gpu/windows/dxva_picture_buffer_win.cc
@@ -50,7 +50,7 @@ class DummyGLImage : public gl::GLImage {
const gfx::Rect& bounds_rect,
const gfx::RectF& crop_rect,
bool enable_blend,
- gfx::GpuFence* gpu_fence) override {
+ std::unique_ptr<gfx::GpuFence> gpu_fence) override {
return false;
}
void SetColorSpace(const gfx::ColorSpace& color_space) override {}
@@ -291,7 +291,7 @@ bool PbufferPictureBuffer::InitializeTexture(
void PbufferPictureBuffer::ResetReuseFence() {
DCHECK_EQ(IN_CLIENT, state_);
if (!reuse_fence_ || !reuse_fence_->ResetSupported())
- reuse_fence_.reset(gl::GLFence::Create());
+ reuse_fence_ = gl::GLFence::Create();
else
reuse_fence_->ResetState();
state_ = WAITING_TO_REUSE;