OLD | NEW |
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 CC_RESOURCES_UI_RESOURCE_REQUEST_H_ | 5 #ifndef CC_RESOURCES_UI_RESOURCE_REQUEST_H_ |
6 #define CC_RESOURCES_UI_RESOURCE_REQUEST_H_ | 6 #define CC_RESOURCES_UI_RESOURCE_REQUEST_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/logging.h" | 10 #include "base/logging.h" |
9 #include "base/memory/scoped_ptr.h" | |
10 #include "cc/base/cc_export.h" | 11 #include "cc/base/cc_export.h" |
11 #include "cc/resources/ui_resource_bitmap.h" | 12 #include "cc/resources/ui_resource_bitmap.h" |
12 #include "cc/resources/ui_resource_client.h" | 13 #include "cc/resources/ui_resource_client.h" |
13 | 14 |
14 namespace cc { | 15 namespace cc { |
15 | 16 |
16 class CC_EXPORT UIResourceRequest { | 17 class CC_EXPORT UIResourceRequest { |
17 public: | 18 public: |
18 enum UIResourceRequestType { | 19 enum UIResourceRequestType { |
19 UI_RESOURCE_CREATE, | 20 UI_RESOURCE_CREATE, |
(...skipping 14 matching lines...) Expand all Loading... |
34 UIResourceBitmap GetBitmap() const { | 35 UIResourceBitmap GetBitmap() const { |
35 DCHECK(bitmap_); | 36 DCHECK(bitmap_); |
36 return *bitmap_.get(); | 37 return *bitmap_.get(); |
37 } | 38 } |
38 | 39 |
39 UIResourceRequest& operator=(const UIResourceRequest& request); | 40 UIResourceRequest& operator=(const UIResourceRequest& request); |
40 | 41 |
41 private: | 42 private: |
42 UIResourceRequestType type_; | 43 UIResourceRequestType type_; |
43 UIResourceId id_; | 44 UIResourceId id_; |
44 scoped_ptr<UIResourceBitmap> bitmap_; | 45 std::unique_ptr<UIResourceBitmap> bitmap_; |
45 }; | 46 }; |
46 | 47 |
47 } // namespace cc | 48 } // namespace cc |
48 | 49 |
49 #endif // CC_RESOURCES_UI_RESOURCE_REQUEST_H_ | 50 #endif // CC_RESOURCES_UI_RESOURCE_REQUEST_H_ |
OLD | NEW |