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

Side by Side Diff: cc/output/filter_operation.h

Issue 869043008: Reland of Move tracing namespace from base::debug to base::trace_event. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@lkcr
Patch Set: Fix suppressions 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
« no previous file with comments | « cc/output/begin_frame_args.h ('k') | cc/output/filter_operations.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 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 // TODO(ssid): remove these aliases after the tracing clients are moved to the
24 // new trace_event namespace. See crbug.com/451032. ETA: March 2015
25 namespace debug {
26 using ::base::trace_event::TracedValue;
27 }
22 class Value; 28 class Value;
23 } 29 } // namespace base
24 30
25 namespace cc { 31 namespace cc {
26 32
27 class CC_EXPORT FilterOperation { 33 class CC_EXPORT FilterOperation {
28 public: 34 public:
29 enum FilterType { 35 enum FilterType {
30 GRAYSCALE, 36 GRAYSCALE,
31 SEPIA, 37 SEPIA,
32 SATURATE, 38 SATURATE,
33 HUE_ROTATE, 39 HUE_ROTATE,
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
252 SkColor drop_shadow_color_; 258 SkColor drop_shadow_color_;
253 skia::RefPtr<SkImageFilter> image_filter_; 259 skia::RefPtr<SkImageFilter> image_filter_;
254 SkScalar matrix_[20]; 260 SkScalar matrix_[20];
255 int zoom_inset_; 261 int zoom_inset_;
256 SkRegion region_; 262 SkRegion region_;
257 }; 263 };
258 264
259 } // namespace cc 265 } // namespace cc
260 266
261 #endif // CC_OUTPUT_FILTER_OPERATION_H_ 267 #endif // CC_OUTPUT_FILTER_OPERATION_H_
OLDNEW
« no previous file with comments | « cc/output/begin_frame_args.h ('k') | cc/output/filter_operations.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698