| OLD | NEW |
| 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 <d3d9.h> | 8 #include <d3d9.h> |
| 9 | 9 |
| 10 #include <DXGIType.h> |
| 11 |
| 10 // Work around bug in this header by disabling the relevant warning for it. | 12 // Work around bug in this header by disabling the relevant warning for it. |
| 11 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h
-in-win8-sdk-triggers-c4201-with-w4 | 13 // https://connect.microsoft.com/VisualStudio/feedback/details/911260/dxva2api-h
-in-win8-sdk-triggers-c4201-with-w4 |
| 12 #pragma warning(push) | 14 #pragma warning(push) |
| 13 #pragma warning(disable : 4201) | 15 #pragma warning(disable : 4201) |
| 14 #include <dxva2api.h> | 16 #include <dxva2api.h> |
| 15 #pragma warning(pop) | 17 #pragma warning(pop) |
| 16 | 18 |
| 17 #include "ui/gfx/color_space.h" | 19 #include "ui/gfx/color_space.h" |
| 18 | 20 |
| 19 namespace gfx { | 21 namespace gfx { |
| 20 | 22 |
| 21 class GFX_EXPORT ColorSpaceWin { | 23 class GFX_EXPORT ColorSpaceWin { |
| 22 public: | 24 public: |
| 23 static DXVA2_ExtendedFormat GetExtendedFormat(const ColorSpace& color_space); | 25 static DXVA2_ExtendedFormat GetExtendedFormat(const ColorSpace& color_space); |
| 26 static DXGI_COLOR_SPACE_TYPE GetDXGIColorSpace(const ColorSpace& color_space); |
| 24 }; | 27 }; |
| 25 | 28 |
| 26 } // namespace gfx | 29 } // namespace gfx |
| 27 #endif | 30 #endif |
| OLD | NEW |