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

Side by Side Diff: ui/gfx/color_space_win.h

Issue 2915673003: ui/gfx: Use separate components for color_space and switches (Closed)
Patch Set: Fix windows build Created 3 years, 6 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
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 UI_GFX_COLOR_SPACE_WIN_H_ 5 #ifndef UI_GFX_COLOR_SPACE_WIN_H_
6 #define UI_GFX_COLOR_SPACE_WIN_H_ 6 #define UI_GFX_COLOR_SPACE_WIN_H_
7 7
8 #include <d3d11.h> 8 #include <d3d11.h>
9 #include <d3d9.h> 9 #include <d3d9.h>
10 10
11 // Must be included after d3d headers, use #if to avoid lint errors. 11 // Must be included after d3d headers, use #if to avoid lint errors.
12 #if 1 12 #if 1
13 #include <DXGIType.h> 13 #include <DXGIType.h>
14 #endif 14 #endif
15 15
16 // Work around bug in this header by disabling the relevant warning for it. 16 // Work around bug in this header by disabling the relevant warning for it.
17 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h -in-win8-sdk-triggers-c4201-with-w4 17 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h -in-win8-sdk-triggers-c4201-with-w4
18 #pragma warning(push) 18 #pragma warning(push)
19 #pragma warning(disable : 4201) 19 #pragma warning(disable : 4201)
20 #include <dxva2api.h> 20 #include <dxva2api.h>
21 #pragma warning(pop) 21 #pragma warning(pop)
22 22
23 #include "ui/gfx/color_space.h" 23 #include "ui/gfx/color_space.h"
24 24
25 namespace gfx { 25 namespace gfx {
26 26
27 class GFX_EXPORT ColorSpaceWin { 27 class GFX_COLOR_EXPORT ColorSpaceWin {
28 public: 28 public:
29 static DXVA2_ExtendedFormat GetExtendedFormat(const ColorSpace& color_space); 29 static DXVA2_ExtendedFormat GetExtendedFormat(const ColorSpace& color_space);
30 static DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(const ColorSpace& color_space); 30 static DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(const ColorSpace& color_space);
31 static D3D11_VIDEO_PROCESSOR_COLOR_SPACE GetD3D11ColorSpace( 31 static D3D11_VIDEO_PROCESSOR_COLOR_SPACE GetD3D11ColorSpace(
32 const ColorSpace& color_space); 32 const ColorSpace& color_space);
33 }; 33 };
34 34
35 } // namespace gfx 35 } // namespace gfx
36 #endif 36 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698