| 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> |
| 9 |
| 8 #include "base/basictypes.h" | 10 #include "base/basictypes.h" |
| 9 #include "base/memory/scoped_ptr.h" | 11 #include "base/memory/scoped_ptr.h" |
| 12 #include "cc/cc_export.h" |
| 10 #include "cc/scoped_ptr_deque.h" | 13 #include "cc/scoped_ptr_deque.h" |
| 11 #include <set> | |
| 12 #include "third_party/khronos/GLES2/gl2.h" | 14 #include "third_party/khronos/GLES2/gl2.h" |
| 13 | 15 |
| 14 namespace WebKit { | 16 namespace WebKit { |
| 15 class WebGraphicsContext3D; | 17 class WebGraphicsContext3D; |
| 16 } | 18 } |
| 17 | 19 |
| 18 namespace gfx { | 20 namespace gfx { |
| 19 class Rect; | 21 class Rect; |
| 20 class Size; | 22 class Size; |
| 21 class Vector2d; | 23 class Vector2d; |
| 22 } | 24 } |
| 23 | 25 |
| 24 namespace cc { | 26 namespace cc { |
| 25 | 27 |
| 26 class TextureUploader { | 28 class CC_EXPORT TextureUploader { |
| 27 public: | 29 public: |
| 28 static scoped_ptr<TextureUploader> create( | 30 static scoped_ptr<TextureUploader> create( |
| 29 WebKit::WebGraphicsContext3D* context, bool useMapTexSubImage) | 31 WebKit::WebGraphicsContext3D* context, bool useMapTexSubImage) |
| 30 { | 32 { |
| 31 return make_scoped_ptr(new TextureUploader(context, useMapTexSubImage)); | 33 return make_scoped_ptr(new TextureUploader(context, useMapTexSubImage)); |
| 32 } | 34 } |
| 33 ~TextureUploader(); | 35 ~TextureUploader(); |
| 34 | 36 |
| 35 size_t numBlockingUploads(); | 37 size_t numBlockingUploads(); |
| 36 void markPendingUploadsAsNonBlocking(); | 38 void markPendingUploadsAsNonBlocking(); |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 98 bool m_useMapTexSubImage; | 100 bool m_useMapTexSubImage; |
| 99 size_t m_subImageSize; | 101 size_t m_subImageSize; |
| 100 scoped_array<uint8> m_subImage; | 102 scoped_array<uint8> m_subImage; |
| 101 | 103 |
| 102 DISALLOW_COPY_AND_ASSIGN(TextureUploader); | 104 DISALLOW_COPY_AND_ASSIGN(TextureUploader); |
| 103 }; | 105 }; |
| 104 | 106 |
| 105 } // namespace cc | 107 } // namespace cc |
| 106 | 108 |
| 107 #endif // CC_TEXTURE_UPLOADER_H_ | 109 #endif // CC_TEXTURE_UPLOADER_H_ |
| OLD | NEW |