Merge 184464

cc/debug_colors.h

 // Copyright 2012 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_DEBUG_COLORS_H_
 #define CC_DEBUG_COLORS_H_
 
 #include "base/basictypes.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 namespace cc {
 
 class LayerTreeImpl;
 
 class DebugColors {
  public:
   static SkColor TiledContentLayerBorderColor();
   static int TiledContentLayerBorderWidth(const LayerTreeImpl* tree_impl);
 
+  static SkColor ImageLayerBorderColor();
+  static int ImageLayerBorderWidth(const LayerTreeImpl* tree_impl);
+
   static SkColor ContentLayerBorderColor();
   static int ContentLayerBorderWidth(const LayerTreeImpl* tree_impl);
 
   static SkColor MaskingLayerBorderColor();
   static int MaskingLayerBorderWidth(const LayerTreeImpl* tree_impl);
 
   static SkColor ContainerLayerBorderColor();
   static int ContainerLayerBorderWidth(const LayerTreeImpl* tree_impl);
 
   static SkColor SurfaceBorderColor();
@@ skipping 55 matching lines @@
   static SkColor PlatformLayerTreeTextColor();
   static SkColor FPSDisplayTextAndGraphColor();
   static SkColor PaintTimeDisplayTextAndGraphColor();
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(DebugColors);
 };
 
 }  // namespace cc
 
 #endif  // CC_DEBUG_COLORS_H_