| Index: content/common/gpu/media/dxva_video_decode_accelerator.h
|
| diff --git a/content/common/gpu/media/dxva_video_decode_accelerator.h b/content/common/gpu/media/dxva_video_decode_accelerator.h
|
| index 0cb9afb52fb863cd90cc60f8fbabee5df1eed0b6..918531dc988f1b687c172d75611bc2053a476c80 100644
|
| --- a/content/common/gpu/media/dxva_video_decode_accelerator.h
|
| +++ b/content/common/gpu/media/dxva_video_decode_accelerator.h
|
| @@ -343,14 +343,11 @@ class CONTENT_EXPORT DXVAVideoDecodeAccelerator
|
| // Used to synchronize access between the decoder thread and the main thread.
|
| base::Lock decoder_lock_;
|
|
|
| - // WeakPtrFactory for posting tasks back to |this|.
|
| - base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_;
|
| -
|
| // Disallow rebinding WeakReference ownership to a different thread by
|
| // keeping a persistent reference. This avoids problems with the
|
| // thread safety of reaching into this class from multiple threads to
|
| // attain a WeakPtr.
|
| - const base::WeakPtr<DXVAVideoDecodeAccelerator> weak_ptr_;
|
| + base::WeakPtr<DXVAVideoDecodeAccelerator> weak_ptr_;
|
|
|
| // Set to true if we are in the context of a Flush operation. Used to prevent
|
| // multiple flush done notifications being sent out.
|
| @@ -367,6 +364,9 @@ class CONTENT_EXPORT DXVAVideoDecodeAccelerator
|
| // The GLContext to be used by the decoder.
|
| scoped_refptr<gfx::GLContext> gl_context_;
|
|
|
| + // WeakPtrFactory for posting tasks back to |this|.
|
| + base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_;
|
| +
|
| // Function pointer for the MFCreateDXGIDeviceManager API.
|
| static CreateDXGIDeviceManager create_dxgi_device_manager_;
|
| };
|
|
|