Chromium Code Reviews| Index: ui/views/controls/label.cc |
| diff --git a/ui/views/controls/label.cc b/ui/views/controls/label.cc |
| index 2d1694204b13989252d5fbc53687aa944ef515f9..2bd1433c75de5fa2cf59a59d003e303bab400b29 100644 |
| --- a/ui/views/controls/label.cc |
| +++ b/ui/views/controls/label.cc |
| @@ -455,7 +455,6 @@ void Label::PaintText(gfx::Canvas* canvas) { |
| for (size_t i = 0; i < lines_.size(); ++i) |
| lines_[i]->Draw(canvas); |
| -#if DCHECK_IS_ON() |
|
sky
2017/03/03 19:15:39
Why ar eyou removing the DCHECK_IS_ON conditional?
Qiang(Joe) Xu
2017/03/03 19:29:54
Done. I thought we were going to remove the follow
|
| // Attempt to ensure that if we're using subpixel rendering, we're painting |
| // to an opaque background. What we don't want to find is an ancestor in the |
| // hierarchy that paints to a non-opaque layer. |
| @@ -467,14 +466,12 @@ void Label::PaintText(gfx::Canvas* canvas) { |
| SkColorGetA(view->background()->get_color()) == SK_AlphaOPAQUE) |
| break; |
| - if (view->layer()) { |
| - DCHECK(view->layer()->fills_bounds_opaquely()) |
| - << " Ancestor view has a non-opaque layer: " << view->GetClassName() |
| - << " with ID " << view->id(); |
| + if (view->layer() && view->layer()->fills_bounds_opaquely()) { |
| + LOG(WARNING) << "Ancestor view has a non-opaque layer: " |
|
sky
2017/03/03 19:15:39
DLOG at best.
Qiang(Joe) Xu
2017/03/03 19:29:54
Done.
|
| + << view->GetClassName() << " with ID " << view->id(); |
| break; |
| } |
| } |
| -#endif |
| } |
| void Label::OnBoundsChanged(const gfx::Rect& previous_bounds) { |