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

Unified Diff: cc/base/filter_operation.h

Issue 2748263002: Move cc::DisplayItemList and related classes into cc/paint/ (Closed)
Patch Set: Merge branch 'master' into ccpaint Created 3 years, 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/base/delayed_unique_notifier.h ('k') | cc/base/filter_operation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/base/filter_operation.h
diff --git a/cc/output/filter_operation.h b/cc/base/filter_operation.h
similarity index 95%
rename from cc/output/filter_operation.h
rename to cc/base/filter_operation.h
index 63edc3a6b24be3c493ae95570f9634439e1c998b..2508870bdb0ca9215419a77ad5f346e848c193a3 100644
--- a/cc/output/filter_operation.h
+++ b/cc/base/filter_operation.h
@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CC_OUTPUT_FILTER_OPERATION_H_
-#define CC_OUTPUT_FILTER_OPERATION_H_
+#ifndef CC_BASE_FILTER_OPERATION_H_
+#define CC_BASE_FILTER_OPERATION_H_
#include <memory>
#include "base/logging.h"
-#include "cc/base/cc_export.h"
+#include "cc/base/base_export.h"
#include "third_party/skia/include/core/SkColor.h"
#include "third_party/skia/include/core/SkImageFilter.h"
#include "third_party/skia/include/core/SkRegion.h"
@@ -27,7 +27,7 @@ class Rect;
namespace cc {
-class CC_EXPORT FilterOperation {
+class CC_BASE_EXPORT FilterOperation {
public:
enum FilterType {
GRAYSCALE,
@@ -44,7 +44,7 @@ class CC_EXPORT FilterOperation {
ZOOM,
REFERENCE,
SATURATING_BRIGHTNESS, // Not used in CSS/SVG.
- ALPHA_THRESHOLD, // Not used in CSS/SVG.
+ ALPHA_THRESHOLD, // Not used in CSS/SVG.
FILTER_TYPE_LAST = ALPHA_THRESHOLD
};
@@ -159,8 +159,8 @@ class CC_EXPORT FilterOperation {
static FilterOperation CreateAlphaThresholdFilter(const SkRegion& region,
float inner_threshold,
float outer_threshold) {
- return FilterOperation(ALPHA_THRESHOLD, region,
- inner_threshold, outer_threshold);
+ return FilterOperation(ALPHA_THRESHOLD, region, inner_threshold,
+ outer_threshold);
}
bool operator==(const FilterOperation& other) const;
@@ -270,4 +270,4 @@ class CC_EXPORT FilterOperation {
} // namespace cc
-#endif // CC_OUTPUT_FILTER_OPERATION_H_
+#endif // CC_BASE_FILTER_OPERATION_H_
« no previous file with comments | « cc/base/delayed_unique_notifier.h ('k') | cc/base/filter_operation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698