| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 CC_TEXTURE_UPLOADER_H_ | 5 #ifndef CC_TEXTURE_UPLOADER_H_ |
| 6 #define CC_TEXTURE_UPLOADER_H_ | 6 #define CC_TEXTURE_UPLOADER_H_ |
| 7 | 7 |
| 8 #include <set> | 8 #include <set> |
| 9 | 9 |
| 10 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 11 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "cc/cc_export.h" | 12 #include "cc/base/cc_export.h" |
| 13 #include "cc/scoped_ptr_deque.h" | 13 #include "cc/base/scoped_ptr_deque.h" |
| 14 #include "third_party/khronos/GLES2/gl2.h" | 14 #include "third_party/khronos/GLES2/gl2.h" |
| 15 | 15 |
| 16 namespace WebKit { | 16 namespace WebKit { |
| 17 class WebGraphicsContext3D; | 17 class WebGraphicsContext3D; |
| 18 } | 18 } |
| 19 | 19 |
| 20 namespace gfx { | 20 namespace gfx { |
| 21 class Rect; | 21 class Rect; |
| 22 class Size; | 22 class Size; |
| 23 class Vector2d; | 23 class Vector2d; |
| (...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 111 | 111 |
| 112 bool m_useShallowFlush; | 112 bool m_useShallowFlush; |
| 113 size_t m_numTextureUploadsSinceLastFlush; | 113 size_t m_numTextureUploadsSinceLastFlush; |
| 114 | 114 |
| 115 DISALLOW_COPY_AND_ASSIGN(TextureUploader); | 115 DISALLOW_COPY_AND_ASSIGN(TextureUploader); |
| 116 }; | 116 }; |
| 117 | 117 |
| 118 } // namespace cc | 118 } // namespace cc |
| 119 | 119 |
| 120 #endif // CC_TEXTURE_UPLOADER_H_ | 120 #endif // CC_TEXTURE_UPLOADER_H_ |
| OLD | NEW |