Simplify content_layer attachment and viewporting logic.

chrome/browser/android/compositor/layer/content_layer.cc

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 ec014eccf897247e41977fb347f7bd4083925082..67f0057eab35913e33849837ee5a5f5c8672bfb9 100644
--- a/chrome/browser/android/compositor/layer/content_layer.cc
+++ b/chrome/browser/android/compositor/layer/content_layer.cc
@@ -7,6 +7,7 @@
 #include "base/lazy_instance.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_collections.h"
+#include "cc/output/filter_operations.h"
 #include "chrome/browser/android/compositor/layer/thumbnail_layer.h"
 #include "chrome/browser/android/compositor/tab_content_manager.h"
 #include "content/public/browser/android/compositor.h"
@@ -61,85 +62,53 @@ void ContentLayer::SetProperties(int id,
                                  bool should_override_content_alpha,
                                  float content_alpha_override,
                                  float saturation,
-                                 const gfx::Rect& desired_bounds,
-                                 const gfx::Size& content_size) {
+                                 bool should_clip,
+                                 const gfx::Rect& clip) {
   scoped_refptr<cc::Layer> content_layer =
       tab_content_manager_->GetLiveLayer(id);
-  ClipContentLayer(content_layer, desired_bounds);
   bool content_layer_draws = DoesLeafDrawContents(content_layer);
 
   scoped_refptr<ThumbnailLayer> static_layer =
       tab_content_manager_->GetStaticLayer(
           id, !(can_use_live_layer && content_layer_draws));
 
-  ClipStaticLayer(static_layer, desired_bounds);
-
-  // Reset the attachment logic if the number of children doesn't match the
-  // boolean flags. At some point while a tab is in the background one or more
-  // layers may be removed from this tree.
-  // Note that this needs to be checked *after* we access TabContentManager, as
-  // that class might remove layers internally, messing up our own tracking.
-  unsigned int expected_layers = 0;
-  expected_layers += content_attached_ ? 1 : 0;
-  expected_layers += static_attached_ ? 1 : 0;
-  if (layer_->children().size() != expected_layers) {
-    content_attached_ = false;
-    static_attached_ = false;
-    const cc::LayerList& layer_children = layer_->children();
-    for (unsigned i = 0; i < layer_children.size(); i++)
-      layer_children[i]->RemoveFromParent();
+  float content_opacity =
+      should_override_content_alpha ? content_alpha_override : 1.0f;
+  float static_opacity =
+      should_override_content_alpha ? content_alpha_override : 1.0f;
+  if (content_layer.get() && can_use_live_layer && content_layer_draws)
+    static_opacity = static_to_view_blend;
+  if (!can_use_live_layer)
+    content_opacity = 0.0f;
+
+  const cc::LayerList& layer_children = layer_->children();
+  for (unsigned i = 0; i < layer_children.size(); i++)
+    layer_children[i]->RemoveFromParent();
+
+  if (content_layer.get()) {
+    content_layer->SetMasksToBounds(should_clip);
+    content_layer->SetBounds(clip.size());
+    SetOpacityOnLeaf(content_layer, content_opacity);
+
+    layer_->AddChild(content_layer);
   }
-
-  gfx::Size content_bounds(0, 0);
-  if (!content_layer.get() || !can_use_live_layer) {
-    SetContentLayer(nullptr);
-    SetStaticLayer(static_layer);
-    if (static_layer.get())
-      content_bounds = static_layer->layer()->bounds();
+  if (static_layer.get()) {
+    static_layer->layer()->SetIsDrawable(true);
+    if (should_clip)
+      static_layer->Clip(clip);
     else
-      content_bounds.set_width(content_size.width());
-  } else {
-    SetContentLayer(content_layer);
-    content_bounds = content_layer->bounds();
-
-    if (static_to_view_blend == 0.0f && !content_layer_draws)
-      static_to_view_blend = 1.0f;
-
-    if (static_to_view_blend != 0.0f && static_layer.get()) {
-      static_layer->layer()->SetOpacity(static_to_view_blend);
-      SetStaticLayer(static_layer);
-      if (content_bounds.GetArea() == 0 || !content_layer_draws)
-        content_bounds = static_layer->layer()->bounds();
-    } else {
-      SetStaticLayer(nullptr);
-    }
-  }
-
-  if (should_override_content_alpha) {
-    for (unsigned int i = 0; i < layer_->children().size(); ++i)
-      SetOpacityOnLeaf(layer_->children()[i], content_alpha_override);
-  }
-
-  if (!content_layer_draws && !static_attached_)
-    content_bounds = gfx::Size(0, 0);
+      static_layer->ClearClip();
+    SetOpacityOnLeaf(static_layer->layer(), static_opacity);
 
-  layer_->SetBounds(content_bounds);
-
-  // Only worry about saturation on the static layer.
-  if (static_layer.get()) {
-    static_filter_operations_.Clear();
+    cc::FilterOperations static_filter_operations;
     if (saturation < 1.0f) {
-      static_filter_operations_.Append(
+      static_filter_operations.Append(
           cc::FilterOperation::CreateSaturateFilter(saturation));
     }
-    static_layer->layer()->SetFilters(static_filter_operations_);
-  }
-}
+    static_layer->layer()->SetFilters(static_filter_operations);
 
-gfx::Size ContentLayer::GetContentSize() {
-  if (content_attached_ && DoesLeafDrawContents(layer()->children()[0]))
-    return layer_->children()[0]->bounds();
-  return gfx::Size(0, 0);
+    layer_->AddChild(static_layer->layer());
+  }
 }
 
 scoped_refptr<cc::Layer> ContentLayer::layer() {
@@ -148,81 +117,9 @@ scoped_refptr<cc::Layer> ContentLayer::layer() {
 
 ContentLayer::ContentLayer(TabContentManager* tab_content_manager)
     : layer_(cc::Layer::Create()),
-      content_attached_(false),
-      static_attached_(false),
       tab_content_manager_(tab_content_manager) {}
 
 ContentLayer::~ContentLayer() {
 }
 
-void ContentLayer::SetContentLayer(scoped_refptr<cc::Layer> layer) {
-  // Check indices
-  // content_attached_, expect at least 1 child.
-  DCHECK(!content_attached_ || layer_->children().size() > 0);
-
-  if (!layer.get()) {
-    if (content_attached_)
-      layer_->child_at(0)->RemoveFromParent();
-    content_attached_ = false;
-    return;
-  }
-
-  bool new_layer = false;
-  if (content_attached_ && layer_->child_at(0)->id() != layer->id()) {
-    layer_->ReplaceChild(layer_->child_at(0), layer);
-    new_layer = true;
-  } else if (!content_attached_) {
-    layer_->InsertChild(layer, 0);
-    new_layer = true;
-  }
-
-  // If this is a new layer, reset it's opacity.
-  if (new_layer)
-    SetOpacityOnLeaf(layer, 1.0f);
-
-  content_attached_ = true;
-}
-
-void ContentLayer::SetStaticLayer(
-    scoped_refptr<ThumbnailLayer> new_static_layer) {
-  // Make sure child access will be valid.
-  // !content_attached_ AND !static_attached_, expect 0 children.
-  // content_attached_ XOR static_attached_, expect 1 child.
-  // content_attached_ AND static_attached_, expect 2 children.
-  DCHECK((!content_attached_ && !static_attached_) ||
-         (content_attached_ != static_attached_ &&
-          layer_->children().size() >= 1) ||
-         (content_attached_ && static_attached_ &&
-          layer_->children().size() >= 2));
-
-  if (!new_static_layer.get()) {
-    if (static_layer_.get()) {
-      static_layer_->layer()->RemoveFromParent();
-      static_layer_ = nullptr;
-    }
-    static_attached_ = false;
-    return;
-  }
-  static_layer_ = new_static_layer;
-  static_layer_->AddSelfToParentOrReplaceAt(layer_, content_attached_ ? 1 : 0);
-  static_layer_->layer()->SetIsDrawable(true);
-  static_attached_ = true;
-}
-
-void ContentLayer::ClipContentLayer(scoped_refptr<cc::Layer> content_layer,
-                                    gfx::Rect clipping) {
-  if (!content_layer.get())
-    return;
-
-  content_layer->SetMasksToBounds(true);
-  content_layer->SetBounds(clipping.size());
-}
-
-void ContentLayer::ClipStaticLayer(scoped_refptr<ThumbnailLayer> static_layer,
-                                   gfx::Rect clipping) {
-  if (!static_layer.get())
-    return;
-  static_layer->Clip(clipping);
-}
-
 }  //  namespace android