Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

cc/debug/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 "base/macros.h"
 
 #include "cc/debug/debug_colors.h"
 
 #include "cc/trees/layer_tree_impl.h"
 
@@ skipping 96 matching lines @@
 }
 
 // Other low-resolution tile borders are green.
 SkColor DebugColors::ExtraLowResTileBorderColor() {
   return SkColorSetARGB(100, 93, 186, 18);
 }
 int DebugColors::ExtraLowResTileBorderWidth(const LayerTreeImpl* tree_impl) {
   return Scale(2, tree_impl);
 }
 
-// Missing tile borders are dark grey.
+// Missing tile borders are red.
 SkColor DebugColors::MissingTileBorderColor() {
-  return SkColorSetARGB(64, 64, 64, 0);
+  return SkColorSetARGB(100, 255, 0, 0);
 }
 int DebugColors::MissingTileBorderWidth(const LayerTreeImpl* tree_impl) {
   return Scale(1, tree_impl);
 }
 
 // Solid color tile borders are grey.
 SkColor DebugColors::SolidColorTileBorderColor() {
   return SkColorSetARGB(128, 128, 128, 128);
 }
 int DebugColors::SolidColorTileBorderWidth(const LayerTreeImpl* tree_impl) {
   return Scale(1, tree_impl);
 }
 
-// OOM tile borders are red.
-SkColor DebugColors::OOMTileBorderColor() {
-  return SkColorSetARGB(100, 255, 0, 0);
+// Picture tile borders are dark grey.
+SkColor DebugColors::PictureTileBorderColor() {
+  return SkColorSetARGB(64, 64, 64, 0);
 }
-int DebugColors::OOMTileBorderWidth(const LayerTreeImpl* tree_impl) {
+int DebugColors::PictureTileBorderWidth(const LayerTreeImpl* tree_impl) {
   return Scale(1, tree_impl);
 }
 
 // Direct picture borders are chartreuse.
 SkColor DebugColors::DirectPictureBorderColor() {
   return SkColorSetARGB(255, 127, 255, 0);
 }
 int DebugColors::DirectPictureBorderWidth(const LayerTreeImpl* tree_impl) {
   return Scale(1, tree_impl);
 }
@@ skipping 146 matching lines @@
 SkColor DebugColors::MemoryDisplayTextColor() {
   return SkColorSetARGB(255, 220, 220, 220);
 }
 
 // Paint time display in green (similar to paint times in the WebInspector)
 SkColor DebugColors::PaintTimeDisplayTextAndGraphColor() {
   return SkColorSetRGB(75, 155, 55);
 }
 
 }  // namespace cc