| 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 COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLOADER_H_ | 5 #ifndef COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLOADER_H_ |
| 6 #define COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLOADER_H_ | 6 #define COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLOADER_H_ |
| 7 | 7 |
| 8 #include <stdint.h> | 8 #include <stdint.h> |
| 9 | 9 |
| 10 #include "base/compiler_specific.h" | 10 #include "base/compiler_specific.h" |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 MojoGLES2Context gles2_context_; | 71 MojoGLES2Context gles2_context_; |
| 72 | 72 |
| 73 mojo::Size size_; | 73 mojo::Size size_; |
| 74 uint32_t color_; | 74 uint32_t color_; |
| 75 int width_; | 75 int width_; |
| 76 int height_; | 76 int height_; |
| 77 Format format_; | 77 Format format_; |
| 78 scoped_ptr<std::vector<unsigned char>> bitmap_; | 78 scoped_ptr<std::vector<unsigned char>> bitmap_; |
| 79 uint32_t next_resource_id_; | 79 uint32_t next_resource_id_; |
| 80 uint32_t id_namespace_; | 80 uint32_t id_namespace_; |
| 81 uint32_t local_id_; | |
| 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 mojo::Binding<mus::mojom::SurfaceClient> surface_client_binding_; | 82 mojo::Binding<mus::mojom::SurfaceClient> surface_client_binding_; |
| 84 | 83 |
| 85 DISALLOW_COPY_AND_ASSIGN(BitmapUploader); | 84 DISALLOW_COPY_AND_ASSIGN(BitmapUploader); |
| 86 }; | 85 }; |
| 87 | 86 |
| 88 } // namespace bitmap_uploader | 87 } // namespace bitmap_uploader |
| 89 | 88 |
| 90 #endif // COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLAODER_H_ | 89 #endif // COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLAODER_H_ |
| OLD | NEW |