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

Side by Side Diff: gpu/command_buffer/service/stream_texture_manager_in_process_android.h

Issue 1542513002: Switch to standard integer types in gpu/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix Created 5 years 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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 GPU_STREAM_TEXTURE_MANAGER_IN_PROCESS_ANDROID_H_ 5 #ifndef GPU_STREAM_TEXTURE_MANAGER_IN_PROCESS_ANDROID_H_
6 #define GPU_STREAM_TEXTURE_MANAGER_IN_PROCESS_ANDROID_H_ 6 #define GPU_STREAM_TEXTURE_MANAGER_IN_PROCESS_ANDROID_H_
7 7
8 #include <stdint.h>
9
8 #include <map> 10 #include <map>
9 11
12 #include "base/macros.h"
10 #include "base/memory/ref_counted.h" 13 #include "base/memory/ref_counted.h"
11 #include "base/memory/weak_ptr.h" 14 #include "base/memory/weak_ptr.h"
12 #include "base/synchronization/lock.h" 15 #include "base/synchronization/lock.h"
13 #include "base/threading/non_thread_safe.h" 16 #include "base/threading/non_thread_safe.h"
14 17
15 namespace gfx { 18 namespace gfx {
16 class SurfaceTexture; 19 class SurfaceTexture;
17 } 20 }
18 21
19 namespace gpu { 22 namespace gpu {
20 23
21 namespace gles2 { 24 namespace gles2 {
22 class TextureManager; 25 class TextureManager;
23 } 26 }
24 27
25 class StreamTextureManagerInProcess : public base::NonThreadSafe { 28 class StreamTextureManagerInProcess : public base::NonThreadSafe {
26 public: 29 public:
27 StreamTextureManagerInProcess(); 30 StreamTextureManagerInProcess();
28 ~StreamTextureManagerInProcess(); 31 ~StreamTextureManagerInProcess();
29 32
30 uint32 CreateStreamTexture(uint32 client_texture_id, 33 uint32_t CreateStreamTexture(uint32_t client_texture_id,
31 gles2::TextureManager* texture_manager); 34 gles2::TextureManager* texture_manager);
32 35
33 // This method can be called from any thread. 36 // This method can be called from any thread.
34 scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(uint32 stream_id); 37 scoped_refptr<gfx::SurfaceTexture> GetSurfaceTexture(uint32_t stream_id);
35 38
36 private: 39 private:
37 void OnReleaseStreamTexture(uint32 stream_id); 40 void OnReleaseStreamTexture(uint32_t stream_id);
38 41
39 typedef std::map<uint32, scoped_refptr<gfx::SurfaceTexture> > TextureMap; 42 typedef std::map<uint32_t, scoped_refptr<gfx::SurfaceTexture>> TextureMap;
40 TextureMap textures_; 43 TextureMap textures_;
41 base::Lock map_lock_; 44 base::Lock map_lock_;
42 uint32 next_id_; 45 uint32_t next_id_;
43 46
44 base::WeakPtrFactory<StreamTextureManagerInProcess> weak_factory_; 47 base::WeakPtrFactory<StreamTextureManagerInProcess> weak_factory_;
45 DISALLOW_COPY_AND_ASSIGN(StreamTextureManagerInProcess); 48 DISALLOW_COPY_AND_ASSIGN(StreamTextureManagerInProcess);
46 }; 49 };
47 50
48 } // gpu 51 } // gpu
49 52
50 #endif // GPU_STREAM_TEXTURE_MANAGER_IN_PROCESS_ANDROID_H_ 53 #endif // GPU_STREAM_TEXTURE_MANAGER_IN_PROCESS_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698