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

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

Issue 1859703002: convert //gpu to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: undo part of clang-format Created 4 years, 8 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ 5 #ifndef GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
6 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ 6 #define GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 #include <stdint.h> 9 #include <stdint.h>
10 10
11 #include <algorithm> 11 #include <algorithm>
12 #include <list> 12 #include <list>
no sievers 2016/04/05 19:02:41 #include <memory>
Mostyn Bramley-Moore 2016/04/05 21:35:32 Done.
13 #include <set> 13 #include <set>
14 #include <string> 14 #include <string>
15 #include <vector> 15 #include <vector>
16 #include "base/containers/hash_tables.h" 16 #include "base/containers/hash_tables.h"
17 #include "base/macros.h" 17 #include "base/macros.h"
18 #include "base/memory/ref_counted.h" 18 #include "base/memory/ref_counted.h"
19 #include "gpu/command_buffer/service/feature_info.h" 19 #include "gpu/command_buffer/service/feature_info.h"
20 #include "gpu/command_buffer/service/gl_utils.h" 20 #include "gpu/command_buffer/service/gl_utils.h"
21 #include "gpu/command_buffer/service/memory_tracking.h" 21 #include "gpu/command_buffer/service/memory_tracking.h"
22 #include "gpu/command_buffer/service/sampler_manager.h" 22 #include "gpu/command_buffer/service/sampler_manager.h"
(...skipping 1053 matching lines...) Expand 10 before | Expand all | Expand 10 after
1076 void UpdateCanRenderCondition(Texture::CanRenderCondition old_condition, 1076 void UpdateCanRenderCondition(Texture::CanRenderCondition old_condition,
1077 Texture::CanRenderCondition new_condition); 1077 Texture::CanRenderCondition new_condition);
1078 void UpdateNumImages(int delta); 1078 void UpdateNumImages(int delta);
1079 void IncFramebufferStateChangeCount(); 1079 void IncFramebufferStateChangeCount();
1080 1080
1081 // Helper function called by OnMemoryDump. 1081 // Helper function called by OnMemoryDump.
1082 void DumpTextureRef(base::trace_event::ProcessMemoryDump* pmd, 1082 void DumpTextureRef(base::trace_event::ProcessMemoryDump* pmd,
1083 TextureRef* ref); 1083 TextureRef* ref);
1084 1084
1085 MemoryTypeTracker* GetMemTracker(); 1085 MemoryTypeTracker* GetMemTracker();
1086 scoped_ptr<MemoryTypeTracker> memory_type_tracker_; 1086 std::unique_ptr<MemoryTypeTracker> memory_type_tracker_;
1087 MemoryTracker* memory_tracker_; 1087 MemoryTracker* memory_tracker_;
1088 1088
1089 scoped_refptr<FeatureInfo> feature_info_; 1089 scoped_refptr<FeatureInfo> feature_info_;
1090 1090
1091 FramebufferManager* framebuffer_manager_; 1091 FramebufferManager* framebuffer_manager_;
1092 1092
1093 // Info for each texture in the system. 1093 // Info for each texture in the system.
1094 typedef base::hash_map<GLuint, scoped_refptr<TextureRef> > TextureMap; 1094 typedef base::hash_map<GLuint, scoped_refptr<TextureRef> > TextureMap;
1095 TextureMap textures_; 1095 TextureMap textures_;
1096 1096
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
1138 private: 1138 private:
1139 DecoderTextureState* texture_state_; 1139 DecoderTextureState* texture_state_;
1140 base::TimeTicks begin_time_; 1140 base::TimeTicks begin_time_;
1141 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer); 1141 DISALLOW_COPY_AND_ASSIGN(ScopedTextureUploadTimer);
1142 }; 1142 };
1143 1143
1144 } // namespace gles2 1144 } // namespace gles2
1145 } // namespace gpu 1145 } // namespace gpu
1146 1146
1147 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_ 1147 #endif // GPU_COMMAND_BUFFER_SERVICE_TEXTURE_MANAGER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698