Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4632)

Unified Diff: cc/heads_up_display_layer_impl.cc

Issue 11280012: cc: Move the HUD debug colors into the cc::DebugColors class (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « cc/debug_colors.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/heads_up_display_layer_impl.cc
diff --git a/cc/heads_up_display_layer_impl.cc b/cc/heads_up_display_layer_impl.cc
index 53ace3aac681e4381f52bd02c112cafbd07acb98..de2d99ad16d0320b2c0cdf6d79633f52e5de4913 100644
--- a/cc/heads_up_display_layer_impl.cc
+++ b/cc/heads_up_display_layer_impl.cc
@@ -7,6 +7,7 @@
#include <limits>
#include "base/stringprintf.h"
+#include "cc/debug_colors.h"
#include "cc/debug_rect_history.h"
#include "cc/font_atlas.h"
#include "cc/frame_rate_counter.h"
@@ -317,42 +318,43 @@ void HeadsUpDisplayLayerImpl::drawDebugRects(SkCanvas* canvas, DebugRectHistory*
for (size_t i = 0; i < debugRects.size(); ++i) {
SkColor strokeColor = 0;
SkColor fillColor = 0;
+ float strokeWidth = 0;
switch (debugRects[i].type) {
case PaintRectType:
- // Paint rects in red
- strokeColor = SkColorSetARGB(255, 255, 0, 0);
- fillColor = SkColorSetARGB(30, 255, 0, 0);
+ strokeColor = DebugColors::PaintRectBorderColor();
+ fillColor = DebugColors::PaintRectFillColor();
+ strokeWidth = DebugColors::PaintRectBorderWidth(layerTreeHostImpl());
break;
case PropertyChangedRectType:
- // Property-changed rects in blue
- strokeColor = SkColorSetARGB(255, 255, 0, 0);
- fillColor = SkColorSetARGB(30, 0, 0, 255);
+ strokeColor = DebugColors::PropertyChangedRectBorderColor();
+ fillColor = DebugColors::PropertyChangedRectFillColor();
+ strokeWidth = DebugColors::PropertyChangedRectBorderWidth(layerTreeHostImpl());
break;
case SurfaceDamageRectType:
- // Surface damage rects in yellow-orange
- strokeColor = SkColorSetARGB(255, 200, 100, 0);
- fillColor = SkColorSetARGB(30, 200, 100, 0);
+ strokeColor = DebugColors::SurfaceDamageRectBorderColor();
+ fillColor = DebugColors::SurfaceDamageRectFillColor();
+ strokeWidth = DebugColors::SurfaceDamageRectBorderWidth(layerTreeHostImpl());
break;
case ReplicaScreenSpaceRectType:
- // Screen space rects in green.
- strokeColor = SkColorSetARGB(255, 100, 200, 0);
- fillColor = SkColorSetARGB(30, 100, 200, 0);
+ strokeColor = DebugColors::ScreenSpaceSurfaceReplicaRectBorderColor();
+ fillColor = DebugColors::ScreenSpaceSurfaceReplicaRectFillColor();
+ strokeWidth = DebugColors::ScreenSpaceSurfaceReplicaRectBorderWidth(layerTreeHostImpl());
break;
case ScreenSpaceRectType:
- // Screen space rects in purple.
- strokeColor = SkColorSetARGB(255, 100, 0, 200);
- fillColor = SkColorSetARGB(10, 100, 0, 200);
+ strokeColor = DebugColors::ScreenSpaceLayerRectBorderColor();
+ fillColor = DebugColors::ScreenSpaceLayerRectFillColor();
+ strokeWidth = DebugColors::ScreenSpaceLayerRectBorderWidth(layerTreeHostImpl());
break;
case OccludingRectType:
- // Occluding rects in pink.
- strokeColor = SkColorSetARGB(255, 245, 136, 255);
- fillColor = SkColorSetARGB(10, 245, 136, 255);
+ strokeColor = DebugColors::OccludingRectBorderColor();
+ fillColor = DebugColors::OccludingRectFillColor();
+ strokeWidth = DebugColors::OccludingRectBorderWidth(layerTreeHostImpl());
break;
case NonOccludingRectType:
- // Non-Occluding rects in a reddish color.
- strokeColor = SkColorSetARGB(255, 200, 0, 100);
- fillColor = SkColorSetARGB(10, 200, 0, 100);
+ strokeColor = DebugColors::NonOccludingRectBorderColor();
+ fillColor = DebugColors::NonOccludingRectFillColor();
+ strokeWidth = DebugColors::NonOccludingRectBorderWidth(layerTreeHostImpl());
break;
}
@@ -364,7 +366,7 @@ void HeadsUpDisplayLayerImpl::drawDebugRects(SkCanvas* canvas, DebugRectHistory*
paint.setColor(strokeColor);
paint.setStyle(SkPaint::kStroke_Style);
- paint.setStrokeWidth(2);
+ paint.setStrokeWidth(SkFloatToScalar(strokeWidth));
canvas->drawRect(skRect, paint);
}
}
« no previous file with comments | « cc/debug_colors.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698