| OLD | NEW |
|---|
| 1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 CC_OUTPUT_SHADER_H_ | 5 #ifndef CC_OUTPUT_SHADER_H_ |
| 6 #define CC_OUTPUT_SHADER_H_ | 6 #define CC_OUTPUT_SHADER_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/macros.h" |
| 11 #include "cc/base/cc_export.h" | 11 #include "cc/base/cc_export.h" |
| 12 | 12 |
| 13 namespace gfx { | 13 namespace gfx { |
| 14 class Point; | 14 class Point; |
| 15 class Size; | 15 class Size; |
| 16 } | 16 } |
| 17 | 17 |
| 18 namespace gpu { | 18 namespace gpu { |
| 19 namespace gles2 { | 19 namespace gles2 { |
| 20 class GLES2Interface; | 20 class GLES2Interface; |
| (...skipping 843 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 864 | 864 |
| 865 private: | 865 private: |
| 866 int color_location_; | 866 int color_location_; |
| 867 | 867 |
| 868 DISALLOW_COPY_AND_ASSIGN(FragmentShaderColorAA); | 868 DISALLOW_COPY_AND_ASSIGN(FragmentShaderColorAA); |
| 869 }; | 869 }; |
| 870 | 870 |
| 871 } // namespace cc | 871 } // namespace cc |
| 872 | 872 |
| 873 #endif // CC_OUTPUT_SHADER_H_ | 873 #endif // CC_OUTPUT_SHADER_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1539203002:
Switch to standard integer types in cc/. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master