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

cc/paint/filter_operations.cc

Index: cc/paint/filter_operations.cc
diff --git a/cc/output/filter_operations.cc b/cc/paint/filter_operations.cc
similarity index 97%
rename from cc/output/filter_operations.cc
rename to cc/paint/filter_operations.cc
index dc18a228d168a8283826459aa05ada8bf3a493c0..4a5633b617a7a72776186d982197ab83befd891f 100644
--- a/cc/output/filter_operations.cc
+++ b/cc/paint/filter_operations.cc
@@ -2,7 +2,7 @@
 // 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/paint/filter_operations.h"
 
 #include <stddef.h>
 
@@ -11,7 +11,7 @@
 
 #include "base/trace_event/trace_event_argument.h"
 #include "base/values.h"
-#include "cc/output/filter_operation.h"
+#include "cc/paint/filter_operation.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace cc {
@@ -164,10 +164,7 @@ bool FilterOperations::HasFilterThatAffectsOpacity() const {
         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;
@@ -204,7 +201,7 @@ FilterOperations FilterOperations::Blend(const FilterOperations& from,
   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 {