cc: Fix HudLayer is blurry on high-DPI screens

This change fixes the Hudlayer's resolution on high-DPI screens and
refactors scaling of debug rects and widgets.

BUG=256286

Review URL: https://chromiumcodereview.appspot.com/18348006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@210185 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 20 insertions, 47 deletions

diff --git a/cc/debug/debug_colors.cc b/cc/debug/debug_colors.cc
index 5ffa729..e6f3e28 100644
--- a/cc/debug/debug_colors.cc
+++ b/cc/debug/debug_colors.cc
@@ -167,9 +167,7 @@ SkColor DebugColors::EvictedTileCheckerboardColor() {
 SkColor DebugColors::PaintRectBorderColor() {
   return SkColorSetARGB(255, 255, 0, 0);
 }
-int DebugColors::PaintRectBorderWidth(const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::PaintRectBorderWidth() { return 2; }
 SkColor DebugColors::PaintRectFillColor() {
   return SkColorSetARGB(30, 255, 0, 0);
 }
@@ -178,10 +176,7 @@ SkColor DebugColors::PaintRectFillColor() {
 SkColor DebugColors::PropertyChangedRectBorderColor() {
   return SkColorSetARGB(255, 0, 0, 255);
 }
-int DebugColors::PropertyChangedRectBorderWidth(
-    const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::PropertyChangedRectBorderWidth() { return 2; }
 SkColor DebugColors::PropertyChangedRectFillColor() {
   return SkColorSetARGB(30, 0, 0, 255);
 }
@@ -190,9 +185,7 @@ SkColor DebugColors::PropertyChangedRectFillColor() {
 SkColor DebugColors::SurfaceDamageRectBorderColor() {
   return SkColorSetARGB(255, 200, 100, 0);
 }
-int DebugColors::SurfaceDamageRectBorderWidth(const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::SurfaceDamageRectBorderWidth() { return 2; }
 SkColor DebugColors::SurfaceDamageRectFillColor() {
   return SkColorSetARGB(30, 200, 100, 0);
 }
@@ -201,10 +194,7 @@ SkColor DebugColors::SurfaceDamageRectFillColor() {
 SkColor DebugColors::ScreenSpaceLayerRectBorderColor() {
   return SkColorSetARGB(255, 100, 200, 0);
 }
-int DebugColors::ScreenSpaceLayerRectBorderWidth(
-    const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::ScreenSpaceLayerRectBorderWidth() { return 2; }
 SkColor DebugColors::ScreenSpaceLayerRectFillColor() {
   return SkColorSetARGB(30, 100, 200, 0);
 }
@@ -213,10 +203,7 @@ SkColor DebugColors::ScreenSpaceLayerRectFillColor() {
 SkColor DebugColors::ScreenSpaceSurfaceReplicaRectBorderColor() {
   return SkColorSetARGB(255, 100, 0, 200);
 }
-int DebugColors::ScreenSpaceSurfaceReplicaRectBorderWidth(
-    const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::ScreenSpaceSurfaceReplicaRectBorderWidth() { return 2; }
 SkColor DebugColors::ScreenSpaceSurfaceReplicaRectFillColor() {
   return SkColorSetARGB(10, 100, 0, 200);
 }
@@ -225,9 +212,7 @@ SkColor DebugColors::ScreenSpaceSurfaceReplicaRectFillColor() {
 SkColor DebugColors::OccludingRectBorderColor() {
   return SkColorSetARGB(255, 245, 136, 255);
 }
-int DebugColors::OccludingRectBorderWidth(const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::OccludingRectBorderWidth() { return 2; }
 SkColor DebugColors::OccludingRectFillColor() {
   return SkColorSetARGB(10, 245, 136, 255);
 }
@@ -236,9 +221,7 @@ SkColor DebugColors::OccludingRectFillColor() {
 SkColor DebugColors::NonOccludingRectBorderColor() {
   return SkColorSetARGB(255, 200, 0, 100);
 }
-int DebugColors::NonOccludingRectBorderWidth(const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::NonOccludingRectBorderWidth() { return 2; }
 SkColor DebugColors::NonOccludingRectFillColor() {
   return SkColorSetARGB(10, 200, 0, 100);
 }
@@ -247,10 +230,7 @@ SkColor DebugColors::NonOccludingRectFillColor() {
 SkColor DebugColors::TouchEventHandlerRectBorderColor() {
   return SkColorSetARGB(255, 239, 229, 60);
 }
-int DebugColors::TouchEventHandlerRectBorderWidth(
-    const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::TouchEventHandlerRectBorderWidth() { return 2; }
 SkColor DebugColors::TouchEventHandlerRectFillColor() {
   return SkColorSetARGB(30, 239, 229, 60);
 }
@@ -259,10 +239,7 @@ SkColor DebugColors::TouchEventHandlerRectFillColor() {
 SkColor DebugColors::WheelEventHandlerRectBorderColor() {
   return SkColorSetARGB(255, 189, 209, 57);
 }
-int DebugColors::WheelEventHandlerRectBorderWidth(
-    const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::WheelEventHandlerRectBorderWidth() { return 2; }
 SkColor DebugColors::WheelEventHandlerRectFillColor() {
   return SkColorSetARGB(30, 189, 209, 57);
 }
@@ -271,10 +248,7 @@ SkColor DebugColors::WheelEventHandlerRectFillColor() {
 SkColor DebugColors::NonFastScrollableRectBorderColor() {
   return SkColorSetARGB(255, 238, 163, 59);
 }
-int DebugColors::NonFastScrollableRectBorderWidth(
-    const LayerTreeImpl* tree_impl) {
-  return Scale(2, tree_impl);
-}
+int DebugColors::NonFastScrollableRectBorderWidth() { return 2; }
 SkColor DebugColors::NonFastScrollableRectFillColor() {
   return SkColorSetARGB(30, 238, 163, 59);
 }
diff --git a/cc/debug/debug_colors.h b/cc/debug/debug_colors.h
index be2cf8d..a1335e3 100644
--- a/cc/debug/debug_colors.h
+++ b/cc/debug/debug_colors.h
@@ -67,44 +67,43 @@ class DebugColors {
   static SkColor InvalidatedTileCheckerboardColor();
 
   static SkColor PaintRectBorderColor();
-  static int PaintRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int PaintRectBorderWidth();
   static SkColor PaintRectFillColor();
 
   static SkColor PropertyChangedRectBorderColor();
-  static int PropertyChangedRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int PropertyChangedRectBorderWidth();
   static SkColor PropertyChangedRectFillColor();
 
   static SkColor SurfaceDamageRectBorderColor();
-  static int SurfaceDamageRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int SurfaceDamageRectBorderWidth();
   static SkColor SurfaceDamageRectFillColor();
 
   static SkColor ScreenSpaceLayerRectBorderColor();
-  static int ScreenSpaceLayerRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int ScreenSpaceLayerRectBorderWidth();
   static SkColor ScreenSpaceLayerRectFillColor();
 
   static SkColor ScreenSpaceSurfaceReplicaRectBorderColor();
-  static int ScreenSpaceSurfaceReplicaRectBorderWidth(
-      const LayerTreeImpl* tree_impl);
+  static int ScreenSpaceSurfaceReplicaRectBorderWidth();
   static SkColor ScreenSpaceSurfaceReplicaRectFillColor();
 
   static SkColor OccludingRectBorderColor();
-  static int OccludingRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int OccludingRectBorderWidth();
   static SkColor OccludingRectFillColor();
 
   static SkColor NonOccludingRectBorderColor();
-  static int NonOccludingRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int NonOccludingRectBorderWidth();
   static SkColor NonOccludingRectFillColor();
 
   static SkColor TouchEventHandlerRectBorderColor();
-  static int TouchEventHandlerRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int TouchEventHandlerRectBorderWidth();
   static SkColor TouchEventHandlerRectFillColor();
 
   static SkColor WheelEventHandlerRectBorderColor();
-  static int WheelEventHandlerRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int WheelEventHandlerRectBorderWidth();
   static SkColor WheelEventHandlerRectFillColor();
 
   static SkColor NonFastScrollableRectBorderColor();
-  static int NonFastScrollableRectBorderWidth(const LayerTreeImpl* tree_impl);
+  static int NonFastScrollableRectBorderWidth();
   static SkColor NonFastScrollableRectFillColor();
 
   static SkColor NonPaintedFillColor();