Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(415)

Side by Side Diff: content/common/gpu/media/dxva_video_decode_accelerator.h

Issue 377723002: Fixes for re-enabling more MSVC level 4 warnings: content/ edition (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/common/gpu/client/command_buffer_proxy_impl.cc ('k') | content/common/sandbox_win.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ 5 #ifndef CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_
6 #define CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ 6 #define CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_
7 7
8 #include <d3d9.h> 8 #include <d3d9.h>
9 // Work around bug in this header by disabling the relevant warning for it.
10 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h -in-win8-sdk-triggers-c4201-with-w4
11 #pragma warning(push)
12 #pragma warning(disable:4201)
9 #include <dxva2api.h> 13 #include <dxva2api.h>
14 #pragma warning(pop)
10 #include <list> 15 #include <list>
11 #include <map> 16 #include <map>
12 #include <mfidl.h> 17 #include <mfidl.h>
13 #include <vector> 18 #include <vector>
14 19
15 #include "base/compiler_specific.h" 20 #include "base/compiler_specific.h"
16 #include "base/memory/linked_ptr.h" 21 #include "base/memory/linked_ptr.h"
17 #include "base/memory/weak_ptr.h" 22 #include "base/memory/weak_ptr.h"
18 #include "base/threading/non_thread_safe.h" 23 #include "base/threading/non_thread_safe.h"
19 #include "base/win/scoped_comptr.h" 24 #include "base/win/scoped_comptr.h"
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after
205 // Callback to set the correct gl context. 210 // Callback to set the correct gl context.
206 base::Callback<bool(void)> make_context_current_; 211 base::Callback<bool(void)> make_context_current_;
207 212
208 // WeakPtrFactory for posting tasks back to |this|. 213 // WeakPtrFactory for posting tasks back to |this|.
209 base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_; 214 base::WeakPtrFactory<DXVAVideoDecodeAccelerator> weak_this_factory_;
210 }; 215 };
211 216
212 } // namespace content 217 } // namespace content
213 218
214 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_ 219 #endif // CONTENT_COMMON_GPU_MEDIA_DXVA_VIDEO_DECODE_ACCELERATOR_H_
OLDNEW
« no previous file with comments | « content/common/gpu/client/command_buffer_proxy_impl.cc ('k') | content/common/sandbox_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698