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

Side by Side Diff: cc/base/region.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/base/math_util.cc ('k') | cc/base/region.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 (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 CC_BASE_REGION_H_ 5 #ifndef CC_BASE_REGION_H_
6 #define CC_BASE_REGION_H_ 6 #define CC_BASE_REGION_H_
7 7
8 #include <memory>
8 #include <string> 9 #include <string>
9 10
10 #include "base/memory/scoped_ptr.h"
11 #include "cc/base/cc_export.h" 11 #include "cc/base/cc_export.h"
12 #include "third_party/skia/include/core/SkRegion.h" 12 #include "third_party/skia/include/core/SkRegion.h"
13 #include "ui/gfx/geometry/rect.h" 13 #include "ui/gfx/geometry/rect.h"
14 #include "ui/gfx/skia_util.h" 14 #include "ui/gfx/skia_util.h"
15 15
16 namespace base { 16 namespace base {
17 class Value; 17 class Value;
18 namespace trace_event { 18 namespace trace_event {
19 class TracedValue; 19 class TracedValue;
20 } 20 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
55 55
56 bool Equals(const Region& other) const { 56 bool Equals(const Region& other) const {
57 return skregion_ == other.skregion_; 57 return skregion_ == other.skregion_;
58 } 58 }
59 59
60 gfx::Rect bounds() const { 60 gfx::Rect bounds() const {
61 return gfx::SkIRectToRect(skregion_.getBounds()); 61 return gfx::SkIRectToRect(skregion_.getBounds());
62 } 62 }
63 63
64 std::string ToString() const; 64 std::string ToString() const;
65 scoped_ptr<base::Value> AsValue() const; 65 std::unique_ptr<base::Value> AsValue() const;
66 void AsValueInto(base::trace_event::TracedValue* array) const; 66 void AsValueInto(base::trace_event::TracedValue* array) const;
67 67
68 class CC_EXPORT Iterator { 68 class CC_EXPORT Iterator {
69 public: 69 public:
70 Iterator(); 70 Iterator();
71 explicit Iterator(const Region& region); 71 explicit Iterator(const Region& region);
72 ~Iterator(); 72 ~Iterator();
73 73
74 gfx::Rect rect() const { 74 gfx::Rect rect() const {
75 return gfx::SkIRectToRect(it_.rect()); 75 return gfx::SkIRectToRect(it_.rect());
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 131
132 inline Region UnionRegions(const Region& a, const gfx::Rect& b) { 132 inline Region UnionRegions(const Region& a, const gfx::Rect& b) {
133 Region result = a; 133 Region result = a;
134 result.Union(b); 134 result.Union(b);
135 return result; 135 return result;
136 } 136 }
137 137
138 } // namespace cc 138 } // namespace cc
139 139
140 #endif // CC_BASE_REGION_H_ 140 #endif // CC_BASE_REGION_H_
OLDNEW
« no previous file with comments | « cc/base/math_util.cc ('k') | cc/base/region.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698