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

cc/base/filter_operations.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_OPERATIONS_H_
-#define CC_OUTPUT_FILTER_OPERATIONS_H_
+#ifndef CC_BASE_FILTER_OPERATIONS_H_
+#define CC_BASE_FILTER_OPERATIONS_H_
 
 #include <stddef.h>
 
 #include <memory>
 #include <vector>
 
 #include "base/logging.h"
-#include "cc/output/filter_operation.h"
+#include "cc/base/filter_operation.h"
 
 namespace base {
 namespace trace_event {
 class TracedValue;
 }
 }
 
 namespace gfx {
 class Rect;
 }
 
 namespace cc {
 
 // An ordered list of filter operations.
-class CC_EXPORT FilterOperations {
+class CC_BASE_EXPORT FilterOperations {
  public:
   FilterOperations();
 
   FilterOperations(const FilterOperations& other);
 
   explicit FilterOperations(std::vector<FilterOperation>&& operations);
 
   ~FilterOperations();
 
   FilterOperations& operator=(const FilterOperations& other);
@@ skipping 19 matching lines @@
 
   // Maps "backward" to determine which pixels in the source affect the pixels
   // in the destination rect.
   gfx::Rect MapRectReverse(const gfx::Rect& rect, const SkMatrix& matrix) const;
 
   void GetOutsets(int* top, int* right, int* bottom, int* left) const;
   bool HasFilterThatMovesPixels() const;
   bool HasFilterThatAffectsOpacity() const;
   bool HasReferenceFilter() const;
 
-  size_t size() const {
-    return operations_.size();
-  }
+  size_t size() const { return operations_.size(); }
 
   const std::vector<FilterOperation>& operations() const { return operations_; }
 
   const FilterOperation& at(size_t index) const {
     DCHECK_LT(index, size());
     return operations_[index];
   }
 
   // If |from| is of the same size as this, where in each position, the filter
   // in |from| is of the same type as the filter in this, and if this doesn't
   // contain any reference filters, returns a FilterOperations formed by
   // linearly interpolating at each position a |progress| fraction of the way
   // from the filter in |from| to the filter in this. If |from| and this are of
   // different lengths, they are treated as having the same length by padding
   // the shorter sequence with no-op filters of the same type as the filters in
   // the corresponding positions in the longer sequence. If either sequence has
   // a reference filter or if there is a type mismatch at some position, returns
   // a copy of this.
   FilterOperations Blend(const FilterOperations& from, double progress) const;
 
   void AsValueInto(base::trace_event::TracedValue* value) const;
   std::string ToString() const;
 
  private:
   std::vector<FilterOperation> operations_;
 };
 
 }  // namespace cc
 
-#endif  // CC_OUTPUT_FILTER_OPERATIONS_H_
+#endif  // CC_BASE_FILTER_OPERATIONS_H_