| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 SERVICES_UI_PUBLIC_CPP_BITMAP_UPLOADER_H_ | 5 #ifndef SERVICES_UI_PUBLIC_CPP_BITMAP_UPLOADER_H_ |
| 6 #define SERVICES_UI_PUBLIC_CPP_BITMAP_UPLOADER_H_ | 6 #define SERVICES_UI_PUBLIC_CPP_BITMAP_UPLOADER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 // This may be null if there is an error contacting mus/initializing. We | 71 // This may be null if there is an error contacting mus/initializing. We |
| 72 // assume we'll be shutting down soon and do nothing in this case. | 72 // assume we'll be shutting down soon and do nothing in this case. |
| 73 std::unique_ptr<ui::GLES2Context> gles2_context_; | 73 std::unique_ptr<ui::GLES2Context> gles2_context_; |
| 74 | 74 |
| 75 uint32_t color_; | 75 uint32_t color_; |
| 76 int width_; | 76 int width_; |
| 77 int height_; | 77 int height_; |
| 78 Format format_; | 78 Format format_; |
| 79 std::unique_ptr<std::vector<unsigned char>> bitmap_; | 79 std::unique_ptr<std::vector<unsigned char>> bitmap_; |
| 80 uint32_t next_resource_id_; | 80 uint32_t next_resource_id_; |
| 81 uint32_t id_namespace_; | |
| 82 base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_; | 81 base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_; |
| 83 | 82 |
| 84 DISALLOW_COPY_AND_ASSIGN(BitmapUploader); | 83 DISALLOW_COPY_AND_ASSIGN(BitmapUploader); |
| 85 }; | 84 }; |
| 86 | 85 |
| 87 } // namespace ui | 86 } // namespace ui |
| 88 | 87 |
| 89 #endif // SERVICES_UI_PUBLIC_CPP_BITMAP_UPLOADER_H_ | 88 #endif // SERVICES_UI_PUBLIC_CPP_BITMAP_UPLOADER_H_ |
| OLD | NEW |