| 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_DEMO_BITMAP_UPLOADER_H_ |
| 6 #define SERVICES_UI_PUBLIC_CPP_BITMAP_UPLOADER_H_ | 6 #define SERVICES_UI_DEMO_BITMAP_UPLOADER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include <memory> | 10 #include <memory> |
| 11 | 11 |
| 12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
| 13 #include "base/containers/hash_tables.h" | 13 #include "base/containers/hash_tables.h" |
| 14 #include "base/macros.h" | 14 #include "base/macros.h" |
| 15 #include "gpu/GLES2/gl2chromium.h" | 15 #include "gpu/GLES2/gl2chromium.h" |
| 16 #include "gpu/GLES2/gl2extchromium.h" | 16 #include "gpu/GLES2/gl2extchromium.h" |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 Format format_; | 76 Format format_; |
| 77 std::unique_ptr<std::vector<unsigned char>> bitmap_; | 77 std::unique_ptr<std::vector<unsigned char>> bitmap_; |
| 78 uint32_t next_resource_id_; | 78 uint32_t next_resource_id_; |
| 79 base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_; | 79 base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_; |
| 80 | 80 |
| 81 DISALLOW_COPY_AND_ASSIGN(BitmapUploader); | 81 DISALLOW_COPY_AND_ASSIGN(BitmapUploader); |
| 82 }; | 82 }; |
| 83 | 83 |
| 84 } // namespace ui | 84 } // namespace ui |
| 85 | 85 |
| 86 #endif // SERVICES_UI_PUBLIC_CPP_BITMAP_UPLOADER_H_ | 86 #endif // SERVICES_UI_DEMO_BITMAP_UPLOADER_H_ |
| OLD | NEW |