| 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_SHADER_H_ | 5 #ifndef CC_OUTPUT_SHADER_H_ |
| 6 #define CC_SHADER_H_ | 6 #define CC_OUTPUT_SHADER_H_ |
| 7 | 7 |
| 8 #include <string> |
| 8 #include "third_party/skia/include/core/SkColorPriv.h" | 9 #include "third_party/skia/include/core/SkColorPriv.h" |
| 9 #include <string> | |
| 10 | 10 |
| 11 namespace WebKit { | 11 namespace WebKit { |
| 12 class WebGraphicsContext3D; | 12 class WebGraphicsContext3D; |
| 13 } | 13 } |
| 14 | 14 |
| 15 namespace cc { | 15 namespace cc { |
| 16 | 16 |
| 17 class VertexShaderPosTex { | 17 class VertexShaderPosTex { |
| 18 public: | 18 public: |
| 19 VertexShaderPosTex(); | 19 VertexShaderPosTex(); |
| (...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 356 int colorLocation() const { return m_colorLocation; } | 356 int colorLocation() const { return m_colorLocation; } |
| 357 private: | 357 private: |
| 358 int m_alphaLocation; | 358 int m_alphaLocation; |
| 359 int m_texTransformLocation; | 359 int m_texTransformLocation; |
| 360 int m_frequencyLocation; | 360 int m_frequencyLocation; |
| 361 int m_colorLocation; | 361 int m_colorLocation; |
| 362 }; | 362 }; |
| 363 | 363 |
| 364 } // namespace cc | 364 } // namespace cc |
| 365 | 365 |
| 366 #endif // CC_SHADER_H_ | 366 #endif // CC_OUTPUT_SHADER_H_ |
| OLD | NEW |