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

cc/base/filter_operations.cc

 // 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.
 
-#include "cc/output/filter_operations.h"
+#include "cc/base/filter_operations.h"
 
 #include <stddef.h>
 
 #include <cmath>
 #include <numeric>
 
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
-#include "cc/output/filter_operation.h"
+#include "cc/base/filter_operation.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
 
 FilterOperations::FilterOperations() {}
 
 FilterOperations::FilterOperations(const FilterOperations& other)
     : operations_(other.operations_) {}
 
 FilterOperations::FilterOperations(std::vector<FilterOperation>&& operations)
@@ skipping 132 matching lines @@
     switch (op.type()) {
       case FilterOperation::OPACITY:
       case FilterOperation::BLUR:
       case FilterOperation::DROP_SHADOW:
       case FilterOperation::ZOOM:
       case FilterOperation::REFERENCE:
       case FilterOperation::ALPHA_THRESHOLD:
         return true;
       case FilterOperation::COLOR_MATRIX: {
         const SkScalar* matrix = op.matrix();
-        if (matrix[15] ||
-            matrix[16] ||
-            matrix[17] ||
-            matrix[18] != 1 ||
+        if (matrix[15] || matrix[16] || matrix[17] || matrix[18] != 1 ||
             matrix[19])
           return true;
         break;
       }
       case FilterOperation::GRAYSCALE:
       case FilterOperation::SEPIA:
       case FilterOperation::SATURATE:
       case FilterOperation::HUE_ROTATE:
       case FilterOperation::INVERT:
       case FilterOperation::BRIGHTNESS:
@@ skipping 16 matching lines @@
 FilterOperations FilterOperations::Blend(const FilterOperations& from,
                                          double progress) const {
   if (HasReferenceFilter() || from.HasReferenceFilter())
     return *this;
 
   bool from_is_longer = from.size() > size();
 
   size_t shorter_size, longer_size;
   if (size() == from.size()) {
     shorter_size = longer_size = size();
-  } else if  (from_is_longer) {
+  } else if (from_is_longer) {
     longer_size = from.size();
     shorter_size = size();
   } else {
     longer_size = size();
     shorter_size = from.size();
   }
 
   for (size_t i = 0; i < shorter_size; i++) {
     if (from.at(i).type() != at(i).type())
       return *this;
@@ skipping 29 matching lines @@
 
 std::string FilterOperations::ToString() const {
   base::trace_event::TracedValue value;
   value.BeginArray("FilterOperations");
   AsValueInto(&value);
   value.EndArray();
   return value.ToString();
 }
 
 }  // namespace cc