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

Side by Side Diff: cc/test/test_gpu_memory_buffer_manager.h

Issue 2682743007: cc: Lock access to |buffers_| in TestGpuMemoryBufferManager (Closed)
Patch Set: lockbuffers: . Created 3 years, 10 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
« no previous file with comments | « no previous file | cc/test/test_gpu_memory_buffer_manager.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_ 5 #ifndef CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
6 #define CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_ 6 #define CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
7 7
8 #include <memory> 8 #include <memory>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
11 #include "base/synchronization/lock.h"
11 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h" 12 #include "gpu/command_buffer/client/gpu_memory_buffer_manager.h"
12 13
13 namespace cc { 14 namespace cc {
14 15
15 class TestGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager { 16 class TestGpuMemoryBufferManager : public gpu::GpuMemoryBufferManager {
16 public: 17 public:
17 TestGpuMemoryBufferManager(); 18 TestGpuMemoryBufferManager();
18 ~TestGpuMemoryBufferManager() override; 19 ~TestGpuMemoryBufferManager() override;
19 20
20 std::unique_ptr<TestGpuMemoryBufferManager> 21 std::unique_ptr<TestGpuMemoryBufferManager>
21 CreateClientGpuMemoryBufferManager(); 22 CreateClientGpuMemoryBufferManager();
22 int GetClientId() { return client_id_; } 23 int GetClientId() { return client_id_; }
23 24
24 void OnGpuMemoryBufferDestroyed(gfx::GpuMemoryBufferId gpu_memory_buffer_id); 25 void OnGpuMemoryBufferDestroyed(gfx::GpuMemoryBufferId gpu_memory_buffer_id);
25 26
26 // Overridden from gpu::GpuMemoryBufferManager: 27 // Overridden from gpu::GpuMemoryBufferManager:
27 std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer( 28 std::unique_ptr<gfx::GpuMemoryBuffer> CreateGpuMemoryBuffer(
28 const gfx::Size& size, 29 const gfx::Size& size,
29 gfx::BufferFormat format, 30 gfx::BufferFormat format,
30 gfx::BufferUsage usage, 31 gfx::BufferUsage usage,
31 gpu::SurfaceHandle surface_handle) override; 32 gpu::SurfaceHandle surface_handle) override;
32 void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer, 33 void SetDestructionSyncToken(gfx::GpuMemoryBuffer* buffer,
33 const gpu::SyncToken& sync_token) override; 34 const gpu::SyncToken& sync_token) override;
34 35
35 private: 36 private:
36 // Buffers allocated by this manager. 37 // Buffers allocated by this manager.
37 int last_gpu_memory_buffer_id_ = 1000; 38 int last_gpu_memory_buffer_id_ = 1000;
39 // Use of |buffers_| must be protected by the lock.
40 base::Lock buffers_lock_;
38 std::map<int, gfx::GpuMemoryBuffer*> buffers_; 41 std::map<int, gfx::GpuMemoryBuffer*> buffers_;
39 42
40 // Parent information for child managers. 43 // Parent information for child managers.
41 int client_id_ = -1; 44 int client_id_ = -1;
42 TestGpuMemoryBufferManager* parent_gpu_memory_buffer_manager_ = nullptr; 45 TestGpuMemoryBufferManager* parent_gpu_memory_buffer_manager_ = nullptr;
43 46
44 // Child infomration for parent managers. 47 // Child infomration for parent managers.
45 int last_client_id_ = 5000; 48 int last_client_id_ = 5000;
46 std::map<int, TestGpuMemoryBufferManager*> clients_; 49 std::map<int, TestGpuMemoryBufferManager*> clients_;
47 50
48 DISALLOW_COPY_AND_ASSIGN(TestGpuMemoryBufferManager); 51 DISALLOW_COPY_AND_ASSIGN(TestGpuMemoryBufferManager);
49 }; 52 };
50 53
51 } // namespace cc 54 } // namespace cc
52 55
53 #endif // CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_ 56 #endif // CC_TEST_TEST_GPU_MEMORY_BUFFER_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | cc/test/test_gpu_memory_buffer_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698