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

Side by Side Diff: cc/base/region.h

Issue 882673002: Move tracing namespace from base::debug to base::trace_event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@move_trace_part1
Patch Set: Edited formatting Created 5 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
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 <string> 8 #include <string>
9 9
10 #include "base/memory/scoped_ptr.h" 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 debug { 18 namespace trace_event {
19 class TracedValue; 19 class TracedValue;
20 } 20 }
21
22 // This is added temporarily. Once the renaming of namespace usages
23 // accross all folders are done, this will be removed.
24 // TODO(ssid): crrev.com/837303004
25 namespace debug {
26 using ::base::trace_event::TracedValue;
21 } 27 }
28 } // namespace base
22 29
23 namespace cc { 30 namespace cc {
24 class SimpleEnclosedRegion; 31 class SimpleEnclosedRegion;
25 32
26 class CC_EXPORT Region { 33 class CC_EXPORT Region {
27 public: 34 public:
28 Region(); 35 Region();
29 Region(const Region& region); 36 Region(const Region& region);
30 Region(const gfx::Rect& rect); // NOLINT(runtime/explicit) 37 Region(const gfx::Rect& rect); // NOLINT(runtime/explicit)
31 ~Region(); 38 ~Region();
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
131 138
132 inline Region UnionRegions(const Region& a, const gfx::Rect& b) { 139 inline Region UnionRegions(const Region& a, const gfx::Rect& b) {
133 Region result = a; 140 Region result = a;
134 result.Union(b); 141 result.Union(b);
135 return result; 142 return result;
136 } 143 }
137 144
138 } // namespace cc 145 } // namespace cc
139 146
140 #endif // CC_BASE_REGION_H_ 147 #endif // CC_BASE_REGION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698