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

Unified Diff: cc/layers/layer_impl.cc

Issue 2748263002: Move cc::DisplayItemList and related classes into cc/paint/ (Closed)
Patch Set: Merge branch 'master' into ccpaint Created 3 years, 9 months 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/layers/layer_impl.h ('k') | cc/layers/layer_impl_test_properties.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 1a024ea4523f2a84c8a26f29587ffd9e31381eee..d6ebeec9cd1c418c9967f3c56bfa2fdb6fc18633 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -192,20 +192,23 @@ bool LayerImpl::ShowDebugBorders() const {
}
void LayerImpl::GetDebugBorderProperties(SkColor* color, float* width) const {
+ float device_scale_factor =
+ layer_tree_impl() ? layer_tree_impl()->device_scale_factor() : 1;
+
if (draws_content_) {
*color = DebugColors::ContentLayerBorderColor();
- *width = DebugColors::ContentLayerBorderWidth(layer_tree_impl());
+ *width = DebugColors::ContentLayerBorderWidth(device_scale_factor);
return;
}
if (masks_to_bounds_) {
*color = DebugColors::MaskingLayerBorderColor();
- *width = DebugColors::MaskingLayerBorderWidth(layer_tree_impl());
+ *width = DebugColors::MaskingLayerBorderWidth(device_scale_factor);
return;
}
*color = DebugColors::ContainerLayerBorderColor();
- *width = DebugColors::ContainerLayerBorderWidth(layer_tree_impl());
+ *width = DebugColors::ContainerLayerBorderWidth(device_scale_factor);
}
void LayerImpl::AppendDebugBorderQuad(
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/layers/layer_impl_test_properties.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698