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

Unified Diff: examples/bitmap_uploader/bitmap_uploader.h

Issue 826423008: Use local ids for Surfaces APIs that can only apply to local surfaces (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | examples/bitmap_uploader/bitmap_uploader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: examples/bitmap_uploader/bitmap_uploader.h
diff --git a/examples/bitmap_uploader/bitmap_uploader.h b/examples/bitmap_uploader/bitmap_uploader.h
index ed8ad9543e218f09492c7a7c80493229ad962a83..f89685b24012d288c18f1aec4a4aca82e4ea4ddc 100644
--- a/examples/bitmap_uploader/bitmap_uploader.h
+++ b/examples/bitmap_uploader/bitmap_uploader.h
@@ -8,7 +8,6 @@
#include "base/callback.h"
#include "base/containers/hash_tables.h"
#include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
#include "mojo/public/c/gles2/gles2.h"
#include "mojo/services/geometry/public/interfaces/geometry.mojom.h"
#include "mojo/services/gpu/public/interfaces/gpu.mojom.h"
@@ -44,7 +43,6 @@ class BitmapUploader : public SurfaceClient {
private:
void Upload();
- void OnSurfaceConnectionCreated(SurfacePtr surface, uint32_t id_namespace);
uint32_t BindTextureForSize(const Size size);
uint32_t TextureFormat();
@@ -53,7 +51,6 @@ class BitmapUploader : public SurfaceClient {
void ReturnResources(Array<ReturnedResourcePtr> resources) override;
View* view_;
- SurfacesServicePtr surfaces_service_;
GpuPtr gpu_service_;
MojoGLES2Context gles2_context_;
@@ -67,11 +64,9 @@ class BitmapUploader : public SurfaceClient {
Size surface_size_;
uint32_t next_resource_id_;
uint32_t id_namespace_;
- SurfaceIdPtr surface_id_;
+ uint32_t local_id_;
base::hash_map<uint32_t, uint32_t> resource_to_texture_id_map_;
- base::WeakPtrFactory<BitmapUploader> weak_factory_;
-
DISALLOW_COPY_AND_ASSIGN(BitmapUploader);
};
« no previous file with comments | « no previous file | examples/bitmap_uploader/bitmap_uploader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698