| Index: ui/compositor/layer.cc
|
| diff --git a/ui/compositor/layer.cc b/ui/compositor/layer.cc
|
| index c1347c4e36cc9456d3aa243e22e462505f1fa95a..73cd1d1a9790112d76ee7afd130ae9c72989feb4 100644
|
| --- a/ui/compositor/layer.cc
|
| +++ b/ui/compositor/layer.cc
|
| @@ -653,7 +653,9 @@ void Layer::UpdateNinePatchLayerBorder(const gfx::Rect& border) {
|
| void Layer::SetColor(SkColor color) { GetAnimator()->SetColor(color); }
|
|
|
| SkColor Layer::GetTargetColor() {
|
| - return GetAnimator()->GetTargetColor();
|
| + if (GetAnimator()->IsAnimatingProperty(LayerAnimationElement::COLOR))
|
| + return GetAnimator()->GetTargetColor();
|
| + return cc_layer_->background_color();
|
| }
|
|
|
| SkColor Layer::background_color() const {
|
|
|