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

Side by Side Diff: cc/playback/filter_display_item.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/playback/drawing_display_item.h ('k') | cc/playback/float_clip_display_item.h » ('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_PLAYBACK_FILTER_DISPLAY_ITEM_H_ 5 #ifndef CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
6 #define CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_ 6 #define CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include "base/memory/scoped_ptr.h" 10 #include <memory>
11
12 #include "base/memory/ptr_util.h"
11 #include "cc/base/cc_export.h" 13 #include "cc/base/cc_export.h"
12 #include "cc/output/filter_operations.h" 14 #include "cc/output/filter_operations.h"
13 #include "cc/playback/display_item.h" 15 #include "cc/playback/display_item.h"
14 #include "ui/gfx/geometry/rect_f.h" 16 #include "ui/gfx/geometry/rect_f.h"
15 17
16 class SkCanvas; 18 class SkCanvas;
17 19
18 namespace cc { 20 namespace cc {
19 class ImageSerializationProcessor; 21 class ImageSerializationProcessor;
20 22
(...skipping 22 matching lines...) Expand all
43 FilterOperations filters_; 45 FilterOperations filters_;
44 gfx::RectF bounds_; 46 gfx::RectF bounds_;
45 }; 47 };
46 48
47 class CC_EXPORT EndFilterDisplayItem : public DisplayItem { 49 class CC_EXPORT EndFilterDisplayItem : public DisplayItem {
48 public: 50 public:
49 EndFilterDisplayItem(); 51 EndFilterDisplayItem();
50 explicit EndFilterDisplayItem(const proto::DisplayItem& proto); 52 explicit EndFilterDisplayItem(const proto::DisplayItem& proto);
51 ~EndFilterDisplayItem() override; 53 ~EndFilterDisplayItem() override;
52 54
53 static scoped_ptr<EndFilterDisplayItem> Create() { 55 static std::unique_ptr<EndFilterDisplayItem> Create() {
54 return make_scoped_ptr(new EndFilterDisplayItem()); 56 return base::WrapUnique(new EndFilterDisplayItem());
55 } 57 }
56 58
57 void ToProtobuf(proto::DisplayItem* proto, 59 void ToProtobuf(proto::DisplayItem* proto,
58 ImageSerializationProcessor* image_serialization_processor) 60 ImageSerializationProcessor* image_serialization_processor)
59 const override; 61 const override;
60 void Raster(SkCanvas* canvas, 62 void Raster(SkCanvas* canvas,
61 const gfx::Rect& canvas_target_playback_rect, 63 const gfx::Rect& canvas_target_playback_rect,
62 SkPicture::AbortCallback* callback) const override; 64 SkPicture::AbortCallback* callback) const override;
63 void AsValueInto(const gfx::Rect& visual_rect, 65 void AsValueInto(const gfx::Rect& visual_rect,
64 base::trace_event::TracedValue* array) const override; 66 base::trace_event::TracedValue* array) const override;
65 size_t ExternalMemoryUsage() const override; 67 size_t ExternalMemoryUsage() const override;
66 68
67 int ApproximateOpCount() const { return 0; } 69 int ApproximateOpCount() const { return 0; }
68 bool IsSuitableForGpuRasterization() const { return true; } 70 bool IsSuitableForGpuRasterization() const { return true; }
69 }; 71 };
70 72
71 } // namespace cc 73 } // namespace cc
72 74
73 #endif // CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_ 75 #endif // CC_PLAYBACK_FILTER_DISPLAY_ITEM_H_
OLDNEW
« no previous file with comments | « cc/playback/drawing_display_item.h ('k') | cc/playback/float_clip_display_item.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698