Merge 184464

cc/debug_colors.cc

 // 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.
 
 #include "cc/debug_colors.h"
 
 #include "cc/layer_tree_impl.h"
 
 namespace cc {
 
 static const float Scale(float width, const LayerTreeImpl* tree_impl) {
   return width * (tree_impl ? tree_impl->device_scale_factor() : 1);
 }
 
 // ======= Layer border colors =======
 
 // Tiled content layers are orange.
 SkColor DebugColors::TiledContentLayerBorderColor() { return SkColorSetARGB(128, 255, 128, 0); }
 int DebugColors::TiledContentLayerBorderWidth(const LayerTreeImpl* tree_impl) { return Scale(2, tree_impl); }
 
+// Image layers are olive.
+SkColor DebugColors::ImageLayerBorderColor() { return SkColorSetARGB(128, 128, 128, 0); }
+int DebugColors::ImageLayerBorderWidth(const LayerTreeImpl* tree_impl) { return Scale(2, tree_impl); }
+
 // Non-tiled content layers area green.
 SkColor DebugColors::ContentLayerBorderColor() { return SkColorSetARGB(128, 0, 128, 32); }
 int DebugColors::ContentLayerBorderWidth(const LayerTreeImpl* tree_impl) { return Scale(2, tree_impl); }
 
 // Masking layers are pale blue and wide.
 SkColor DebugColors::MaskingLayerBorderColor() { return SkColorSetARGB(48, 128, 255, 255); }
 int DebugColors::MaskingLayerBorderWidth(const LayerTreeImpl* tree_impl) { return Scale(20, tree_impl); }
 
 // Other container layers are yellow.
 SkColor DebugColors::ContainerLayerBorderColor() { return SkColorSetARGB(192, 255, 255, 0); }
@@ skipping 83 matching lines @@
 
 // ======= HUD widget colors =======
 
 SkColor DebugColors::PlatformLayerTreeTextColor() { return SK_ColorRED; }
 SkColor DebugColors::FPSDisplayTextAndGraphColor() { return SK_ColorRED; }
 
 // Paint time display has the same green as used for paint time in the WebInspector
 SkColor DebugColors::PaintTimeDisplayTextAndGraphColor() { return SkColorSetRGB(95, 160, 80); }
 
 }  // namespace cc