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

cc/layers/render_surface_impl.cc

Index: cc/layers/render_surface_impl.cc
diff --git a/cc/layers/render_surface_impl.cc b/cc/layers/render_surface_impl.cc
index f67b6d1bb028e8b14ab5d1f9da2fabfda116203c..46263ed2f27759cac94620e0791d67f9526d6017 100644
--- a/cc/layers/render_surface_impl.cc
+++ b/cc/layers/render_surface_impl.cc
@@ -13,7 +13,7 @@
 #include "cc/base/math_util.h"
 #include "cc/debug/debug_colors.h"
 #include "cc/layers/layer_impl.h"
-#include "cc/output/filter_operations.h"
+#include "cc/paint/filter_operations.h"
 #include "cc/quads/debug_border_draw_quad.h"
 #include "cc/quads/render_pass.h"
 #include "cc/quads/render_pass_draw_quad.h"
@@ -113,7 +113,8 @@ SkColor RenderSurfaceImpl::GetDebugBorderColor() const {
 }
 
 float RenderSurfaceImpl::GetDebugBorderWidth() const {
-  return DebugColors::SurfaceBorderWidth(layer_tree_impl_);
+  return DebugColors::SurfaceBorderWidth(
+      layer_tree_impl_ ? layer_tree_impl_->device_scale_factor() : 1);
 }
 
 LayerImpl* RenderSurfaceImpl::MaskLayer() {