| Index: cc/paint/filter_operation.h
|
| diff --git a/cc/output/filter_operation.h b/cc/paint/filter_operation.h
|
| similarity index 95%
|
| rename from cc/output/filter_operation.h
|
| rename to cc/paint/filter_operation.h
|
| index 63edc3a6b24be3c493ae95570f9634439e1c998b..f1d8670154f153740cc3f2383f5b9bdab27898fa 100644
|
| --- a/cc/output/filter_operation.h
|
| +++ b/cc/paint/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_PAINT_FILTER_OPERATION_H_
|
| +#define CC_PAINT_FILTER_OPERATION_H_
|
|
|
| #include <memory>
|
|
|
| #include "base/logging.h"
|
| -#include "cc/base/cc_export.h"
|
| +#include "cc/paint/paint_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_PAINT_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_PAINT_FILTER_OPERATION_H_
|
|
|