Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(581)

Side by Side Diff: components/bitmap_uploader/bitmap_uploader.h

Issue 1976703003: Impl mus::mojom::GpuService to enable using Chrome IPC version gpu CmdBuf in mus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix build error Created 4 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 <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 "components/bitmap_uploader/bitmap_uploader_export.h" 15 #include "components/bitmap_uploader/bitmap_uploader_export.h"
16 #include "components/mus/public/cpp/window_surface.h" 16 #include "components/mus/public/cpp/window_surface.h"
17 #include "components/mus/public/cpp/window_surface_client.h" 17 #include "components/mus/public/cpp/window_surface_client.h"
18 #include "components/mus/public/interfaces/compositor_frame.mojom.h" 18 #include "components/mus/public/interfaces/compositor_frame.mojom.h"
sky 2016/06/01 15:45:29 You removed the dep on components/mus/public/inter
Peng 2016/06/01 16:23:21 No. Because the public/cpp uses interfaces as publ
19 #include "components/mus/public/interfaces/gpu.mojom.h"
20 #include "gpu/GLES2/gl2chromium.h" 19 #include "gpu/GLES2/gl2chromium.h"
21 #include "gpu/GLES2/gl2extchromium.h" 20 #include "gpu/GLES2/gl2extchromium.h"
22 21
23 namespace mus { 22 namespace mus {
24 class GLES2Context; 23 class GLES2Context;
25 } 24 }
26 25
27 namespace shell { 26 namespace shell {
28 class Connector; 27 class Connector;
29 } 28 }
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 } 65 }
67 66
68 void SetIdNamespace(uint32_t id_namespace); 67 void SetIdNamespace(uint32_t id_namespace);
69 68
70 // WindowSurfaceClient implementation. 69 // WindowSurfaceClient implementation.
71 void OnResourcesReturned( 70 void OnResourcesReturned(
72 mus::WindowSurface* surface, 71 mus::WindowSurface* surface,
73 mojo::Array<cc::ReturnedResource> resources) override; 72 mojo::Array<cc::ReturnedResource> resources) override;
74 73
75 mus::Window* window_; 74 mus::Window* window_;
76 mus::mojom::GpuPtr gpu_service_;
77 std::unique_ptr<mus::WindowSurface> surface_; 75 std::unique_ptr<mus::WindowSurface> surface_;
78 std::unique_ptr<mus::GLES2Context> gles2_context_; 76 std::unique_ptr<mus::GLES2Context> gles2_context_;
79 77
80 uint32_t color_; 78 uint32_t color_;
81 int width_; 79 int width_;
82 int height_; 80 int height_;
83 Format format_; 81 Format format_;
84 std::unique_ptr<std::vector<unsigned char>> bitmap_; 82 std::unique_ptr<std::vector<unsigned char>> bitmap_;
85 uint32_t next_resource_id_; 83 uint32_t next_resource_id_;
86 uint32_t id_namespace_; 84 uint32_t id_namespace_;
87 base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_; 85 base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_;
88 86
89 DISALLOW_COPY_AND_ASSIGN(BitmapUploader); 87 DISALLOW_COPY_AND_ASSIGN(BitmapUploader);
90 }; 88 };
91 89
92 } // namespace bitmap_uploader 90 } // namespace bitmap_uploader
93 91
94 #endif // COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLAODER_H_ 92 #endif // COMPONENTS_BITMAP_UPLOADER_BITMAP_UPLAODER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698