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

Side by Side Diff: cc/output/filter_operation.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 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_OUTPUT_FILTER_OPERATION_H_ 5 #ifndef CC_OUTPUT_FILTER_OPERATION_H_
6 #define CC_OUTPUT_FILTER_OPERATION_H_ 6 #define CC_OUTPUT_FILTER_OPERATION_H_
7 7
8 #include "base/logging.h" 8 #include "base/logging.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "cc/base/cc_export.h" 10 #include "cc/base/cc_export.h"
11 #include "skia/ext/refptr.h" 11 #include "skia/ext/refptr.h"
12 #include "third_party/skia/include/core/SkColor.h" 12 #include "third_party/skia/include/core/SkColor.h"
13 #include "third_party/skia/include/core/SkImageFilter.h" 13 #include "third_party/skia/include/core/SkImageFilter.h"
14 #include "third_party/skia/include/core/SkRegion.h" 14 #include "third_party/skia/include/core/SkRegion.h"
15 #include "third_party/skia/include/core/SkScalar.h" 15 #include "third_party/skia/include/core/SkScalar.h"
16 #include "ui/gfx/geometry/point.h" 16 #include "ui/gfx/geometry/point.h"
17 17
18 namespace base { 18 namespace base {
19 namespace debug { 19 namespace trace_event {
20 class TracedValue; 20 class TracedValue;
21 } 21 }
22
23 // This is added temporarily. Once the renaming of namespace usages
24 // accross all folders are done, this will be removed.
25 // TODO(ssid): crrev.com/837303004
26 namespace debug {
27 using ::base::trace_event::TracedValue;
28 }
22 class Value; 29 class Value;
23 } 30 } // namespace base
24 31
25 namespace cc { 32 namespace cc {
26 33
27 class CC_EXPORT FilterOperation { 34 class CC_EXPORT FilterOperation {
28 public: 35 public:
29 enum FilterType { 36 enum FilterType {
30 GRAYSCALE, 37 GRAYSCALE,
31 SEPIA, 38 SEPIA,
32 SATURATE, 39 SATURATE,
33 HUE_ROTATE, 40 HUE_ROTATE,
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 SkColor drop_shadow_color_; 259 SkColor drop_shadow_color_;
253 skia::RefPtr<SkImageFilter> image_filter_; 260 skia::RefPtr<SkImageFilter> image_filter_;
254 SkScalar matrix_[20]; 261 SkScalar matrix_[20];
255 int zoom_inset_; 262 int zoom_inset_;
256 SkRegion region_; 263 SkRegion region_;
257 }; 264 };
258 265
259 } // namespace cc 266 } // namespace cc
260 267
261 #endif // CC_OUTPUT_FILTER_OPERATION_H_ 268 #endif // CC_OUTPUT_FILTER_OPERATION_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698