Move cc::DisplayItemList and related classes into cc/paint/

cc/base/filter_operation.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // 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"
 #include "third_party/skia/include/core/SkScalar.h"
 #include "ui/gfx/geometry/point.h"
 
 namespace base {
 namespace trace_event {
 class TracedValue;
 }
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace cc {
 
-class CC_EXPORT FilterOperation {
+class CC_BASE_EXPORT FilterOperation {
  public:
   enum FilterType {
     GRAYSCALE,
     SEPIA,
     SATURATE,
     HUE_ROTATE,
     INVERT,
     BRIGHTNESS,
     CONTRAST,
     OPACITY,
     BLUR,
     DROP_SHADOW,
     COLOR_MATRIX,
     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
   };
 
   FilterOperation();
 
   FilterOperation(const FilterOperation& other);
 
   ~FilterOperation();
 
   FilterType type() const { return type_; }
@@ skipping 94 matching lines @@
     return FilterOperation(REFERENCE, std::move(image_filter));
   }
 
   static FilterOperation CreateSaturatingBrightnessFilter(float amount) {
     return FilterOperation(SATURATING_BRIGHTNESS, amount);
   }
 
   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;
 
   bool operator!=(const FilterOperation& other) const {
     return !(*this == other);
   }
 
   // Methods for restoring a FilterOperation.
   static FilterOperation CreateEmptyFilter() {
@@ skipping 89 matching lines @@
   gfx::Point drop_shadow_offset_;
   SkColor drop_shadow_color_;
   sk_sp<SkImageFilter> image_filter_;
   SkScalar matrix_[20];
   int zoom_inset_;
   SkRegion region_;
 };
 
 }  // namespace cc
 
-#endif  // CC_OUTPUT_FILTER_OPERATION_H_
+#endif  // CC_BASE_FILTER_OPERATION_H_