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

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

Issue 1866203004: Convert //cc from scoped_ptr to std::unique_ptr. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: scopedptrcc: rebase 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
« no previous file with comments | « cc/test/test_in_process_context_provider.cc ('k') | cc/test/test_shared_bitmap_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_SHARED_BITMAP_MANAGER_H_ 5 #ifndef CC_TEST_TEST_SHARED_BITMAP_MANAGER_H_
6 #define CC_TEST_TEST_SHARED_BITMAP_MANAGER_H_ 6 #define CC_TEST_TEST_SHARED_BITMAP_MANAGER_H_
7 7
8 #include <map> 8 #include <map>
9 9
10 #include "base/synchronization/lock.h" 10 #include "base/synchronization/lock.h"
11 #include "cc/resources/shared_bitmap_manager.h" 11 #include "cc/resources/shared_bitmap_manager.h"
12 12
13 namespace base { 13 namespace base {
14 class SharedMemory; 14 class SharedMemory;
15 } // namespace base 15 } // namespace base
16 16
17 namespace cc { 17 namespace cc {
18 18
19 class TestSharedBitmapManager : public SharedBitmapManager { 19 class TestSharedBitmapManager : public SharedBitmapManager {
20 public: 20 public:
21 TestSharedBitmapManager(); 21 TestSharedBitmapManager();
22 ~TestSharedBitmapManager() override; 22 ~TestSharedBitmapManager() override;
23 23
24 scoped_ptr<SharedBitmap> AllocateSharedBitmap(const gfx::Size& size) override; 24 std::unique_ptr<SharedBitmap> AllocateSharedBitmap(
25 const gfx::Size& size) override;
25 26
26 scoped_ptr<SharedBitmap> GetSharedBitmapFromId( 27 std::unique_ptr<SharedBitmap> GetSharedBitmapFromId(
27 const gfx::Size&, 28 const gfx::Size&,
28 const SharedBitmapId& id) override; 29 const SharedBitmapId& id) override;
29 30
30 private: 31 private:
31 base::Lock lock_; 32 base::Lock lock_;
32 std::map<SharedBitmapId, base::SharedMemory*> bitmap_map_; 33 std::map<SharedBitmapId, base::SharedMemory*> bitmap_map_;
33 }; 34 };
34 35
35 } // namespace cc 36 } // namespace cc
36 37
37 #endif // CC_TEST_TEST_SHARED_BITMAP_MANAGER_H_ 38 #endif // CC_TEST_TEST_SHARED_BITMAP_MANAGER_H_
OLDNEW
« no previous file with comments | « cc/test/test_in_process_context_provider.cc ('k') | cc/test/test_shared_bitmap_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698