| Index: chrome/browser/android/compositor/layer/content_layer.cc
|
| diff --git a/chrome/browser/android/compositor/layer/content_layer.cc b/chrome/browser/android/compositor/layer/content_layer.cc
|
| index ffb0b6d53f9d90f3acfbe4c7f62a24735773ca9c..3f1bc3a32f1da195754fa5f9742d7b0eba9b7343 100644
|
| --- a/chrome/browser/android/compositor/layer/content_layer.cc
|
| +++ b/chrome/browser/android/compositor/layer/content_layer.cc
|
| @@ -58,6 +58,7 @@ static cc::Layer* GetDrawsContentLeaf(scoped_refptr<cc::Layer> layer) {
|
|
|
| void ContentLayer::SetProperties(int id,
|
| bool can_use_live_layer,
|
| + bool can_use_static_layer,
|
| float static_to_view_blend,
|
| bool should_override_content_alpha,
|
| float content_alpha_override,
|
| @@ -90,7 +91,7 @@ void ContentLayer::SetProperties(int id,
|
|
|
| layer_->AddChild(live_layer);
|
| }
|
| - if (static_layer.get()) {
|
| + if (static_layer.get() && can_use_static_layer) {
|
| static_layer->layer()->SetIsDrawable(true);
|
| if (should_clip)
|
| static_layer->Clip(clip);
|
|
|