diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
| commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
| tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/media/gpu/windows/dxva_picture_buffer_win.cc | |
| parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
| download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/media/gpu/windows/dxva_picture_buffer_win.cc')
| -rw-r--r-- | chromium/media/gpu/windows/dxva_picture_buffer_win.cc | 4 |
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; |