diff options
| author | Nico Weber <thakis@chromium.org> | 2016-03-19 09:19:06 -0400 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2016-03-19 13:21:18 +0000 |
| commit | 13b3ac887d5011ff3b3c39d0e44ca9aed1740ce8 (patch) | |
| tree | 4c02095ac77522f338b1f2f8efbc55501fd066f4 | |
| parent | 1fc2b1909d378fdd33af7a6d616e2828789f69dc (diff) | |
| download | chromium_src-13b3ac887d5011ff3b3c39d0e44ca9aed1740ce8.zip chromium_src-13b3ac887d5011ff3b3c39d0e44ca9aed1740ce8.tar.gz chromium_src-13b3ac887d5011ff3b3c39d0e44ca9aed1740ce8.tar.bz2 | |
Fix Chromium style plugin warning after https://codereview.chromium.org/1815063002
..\..\content/common/gpu/media/dxva_video_decode_accelerator_win.h(445,52) :
error: [chromium-style] WeakPtrFactory members which refer to their outer
class must be the last member in the outer class definition.
base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_;
^
BUG=82385,594266
TBR=ananta
Review URL: https://codereview.chromium.org/1818533004 .
Cr-Commit-Position: refs/heads/master@{#382196}
| -rw-r--r-- | content/common/gpu/media/dxva_video_decode_accelerator_win.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/content/common/gpu/media/dxva_video_decode_accelerator_win.h b/content/common/gpu/media/dxva_video_decode_accelerator_win.h index 660797c..9dba785 100644 --- a/content/common/gpu/media/dxva_video_decode_accelerator_win.h +++ b/content/common/gpu/media/dxva_video_decode_accelerator_win.h @@ -441,12 +441,6 @@ class CONTENT_EXPORT DXVAVideoDecodeAccelerator // Enables experimental hardware acceleration for VP8/VP9 video decoding. const bool enable_accelerated_vpx_decode_; - // 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_; - // The media foundation H.264 decoder has problems handling changes like // resolution change, bitrate change etc. If we reinitialize the decoder // when these changes occur then, the decoder works fine. The @@ -457,6 +451,12 @@ class CONTENT_EXPORT DXVAVideoDecodeAccelerator // Contains the initialization parameters for the video. Config config_; + // 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_; + DISALLOW_COPY_AND_ASSIGN(DXVAVideoDecodeAccelerator); }; |