Revert of [M55] Generalize layer mirroring for phantom windows

ui/compositor/layer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/compositor/layer.h"
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
@@ skipping 31 matching lines @@
 const ui::Layer* GetRoot(const ui::Layer* layer) {
   while (layer->parent())
     layer = layer->parent();
   return layer;
 }
 
 }  // namespace
 
 namespace ui {
 
-class Layer::LayerMirror : public LayerDelegate, LayerObserver {
- public:
-  LayerMirror(Layer* source, Layer* dest)
-      : source_(source), dest_(dest) {
-    dest->AddObserver(this);
-    dest->set_delegate(this);
-  }
-
-  ~LayerMirror() override {
-    dest_->RemoveObserver(this);
-    dest_->set_delegate(nullptr);
-  }
-
-  Layer* dest() { return dest_; }
-
-  // LayerDelegate:
-  void OnPaintLayer(const PaintContext& context) override {
-    if (auto* delegate = source_->delegate())
-      delegate->OnPaintLayer(context);
-  }
-  void OnDelegatedFrameDamage(const gfx::Rect& damage_rect_in_dip) override {}
-  void OnDeviceScaleFactorChanged(float device_scale_factor) override {}
-
-  // LayerObserver:
-  void LayerDestroyed(Layer* layer) override {
-    DCHECK_EQ(dest_, layer);
-    source_->OnMirrorDestroyed(this);
-  }
-
- private:
-  Layer* const source_;
-  Layer* const dest_;
-
-  DISALLOW_COPY_AND_ASSIGN(LayerMirror);
-};
-
 Layer::Layer()
     : type_(LAYER_TEXTURED),
       compositor_(NULL),
       parent_(NULL),
       visible_(true),
       fills_bounds_opaquely_(true),
       fills_bounds_completely_(false),
       background_blur_radius_(0),
       layer_saturation_(0.0f),
       layer_brightness_(0.0f),
@@ skipping 49 matching lines @@
   if (layer_mask_back_link_)
     layer_mask_back_link_->SetMaskLayer(NULL);
   for (size_t i = 0; i < children_.size(); ++i)
     children_[i]->parent_ = NULL;
 
   cc_layer_->RemoveFromParent();
   if (mailbox_release_callback_)
     mailbox_release_callback_->Run(gpu::SyncToken(), false);
 }
 
-std::unique_ptr<Layer> Layer::Clone() const {
-  auto clone = base::MakeUnique<Layer>(type_);
-
-  clone->SetTransform(GetTargetTransform());
-  clone->SetBounds(bounds_);
-  clone->SetSubpixelPositionOffset(subpixel_position_offset_);
-  clone->SetMasksToBounds(GetMasksToBounds());
-  clone->SetOpacity(GetTargetOpacity());
-  clone->SetVisible(GetTargetVisibility());
-  clone->SetFillsBoundsOpaquely(fills_bounds_opaquely_);
-  clone->SetFillsBoundsCompletely(fills_bounds_completely_);
-  clone->set_name(name_);
-
-  // Background filters.
-  clone->SetBackgroundBlur(background_blur_radius_);
-  clone->SetBackgroundZoom(zoom_, zoom_inset_);
-
-  // Filters.
-  clone->SetLayerSaturation(layer_saturation_);
-  clone->SetLayerBrightness(GetTargetBrightness());
-  clone->SetLayerGrayscale(GetTargetGrayscale());
-  clone->SetLayerInverted(layer_inverted_);
-  if (alpha_shape_)
-    clone->SetAlphaShape(base::MakeUnique<SkRegion>(*alpha_shape_));
-
-  // cc::Layer state.
-  if (surface_layer_ && !surface_layer_->surface_id().is_null()) {
-    clone->SetShowSurface(
-        surface_layer_->surface_id(),
-        surface_layer_->satisfy_callback(),
-        surface_layer_->require_callback(),
-        surface_layer_->surface_size(),
-        surface_layer_->surface_scale(),
-        frame_size_in_dip_);
-  } else if (type_ == LAYER_SOLID_COLOR) {
-    clone->SetColor(GetTargetColor());
-  }
-  return clone;
-}
-
-std::unique_ptr<Layer> Layer::Mirror() {
-  auto mirror = Clone();
-  mirrors_.emplace_back(base::MakeUnique<LayerMirror>(this, mirror.get()));
-  return mirror;
-}
-
 const Compositor* Layer::GetCompositor() const {
   return GetRoot(this)->compositor_;
 }
 
 float Layer::opacity() const {
   return cc_layer_->opacity();
 }
 
 void Layer::SetCompositor(Compositor* compositor,
                           scoped_refptr<cc::Layer> root_layer) {
@@ skipping 99 matching lines @@
   animator_ = animator;
 
   if (animator_) {
     animator_->SetDelegate(this);
     if (compositor)
       animator_->AttachLayerAndTimeline(compositor);
   }
 }
 
 LayerAnimator* Layer::GetAnimator() {
-  if (!animator_)
+  if (!animator_.get())
     SetAnimator(LayerAnimator::CreateDefaultAnimator());
   return animator_.get();
 }
 
 void Layer::SetTransform(const gfx::Transform& transform) {
   GetAnimator()->SetTransform(transform);
 }
 
 gfx::Transform Layer::GetTargetTransform() const {
-  if (animator_ && animator_->IsAnimatingProperty(
+  if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::TRANSFORM)) {
     return animator_->GetTargetTransform();
   }
   return transform();
 }
 
 void Layer::SetBounds(const gfx::Rect& bounds) {
   GetAnimator()->SetBounds(bounds);
 }
 
 void Layer::SetSubpixelPositionOffset(const gfx::Vector2dF& offset) {
   subpixel_position_offset_ = offset;
   RecomputePosition();
 }
 
 gfx::Rect Layer::GetTargetBounds() const {
-  if (animator_ && animator_->IsAnimatingProperty(
+  if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::BOUNDS)) {
     return animator_->GetTargetBounds();
   }
   return bounds_;
 }
 
 void Layer::SetMasksToBounds(bool masks_to_bounds) {
   cc_layer_->SetMasksToBounds(masks_to_bounds);
 }
 
@@ skipping 24 matching lines @@
 void Layer::SetLayerSaturation(float saturation) {
   layer_saturation_ = saturation;
   SetLayerFilters();
 }
 
 void Layer::SetLayerBrightness(float brightness) {
   GetAnimator()->SetBrightness(brightness);
 }
 
 float Layer::GetTargetBrightness() const {
-  if (animator_ && animator_->IsAnimatingProperty(
+  if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::BRIGHTNESS)) {
     return animator_->GetTargetBrightness();
   }
   return layer_brightness();
 }
 
 void Layer::SetLayerGrayscale(float grayscale) {
   GetAnimator()->SetGrayscale(grayscale);
 }
 
 float Layer::GetTargetGrayscale() const {
-  if (animator_ && animator_->IsAnimatingProperty(
+  if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::GRAYSCALE)) {
     return animator_->GetTargetGrayscale();
   }
   return layer_grayscale();
 }
 
 void Layer::SetLayerInverted(bool inverted) {
   layer_inverted_ = inverted;
   SetLayerFilters();
 }
@@ skipping 68 matching lines @@
 
   if (background_blur_radius_) {
     filters.Append(cc::FilterOperation::CreateBlurFilter(
         background_blur_radius_));
   }
 
   cc_layer_->SetBackgroundFilters(filters);
 }
 
 float Layer::GetTargetOpacity() const {
-  if (animator_ && animator_->IsAnimatingProperty(
+  if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::OPACITY))
     return animator_->GetTargetOpacity();
   return opacity();
 }
 
 void Layer::SetVisible(bool visible) {
   GetAnimator()->SetVisibility(visible);
 }
 
 bool Layer::GetTargetVisibility() const {
-  if (animator_ && animator_->IsAnimatingProperty(
+  if (animator_.get() && animator_->IsAnimatingProperty(
       LayerAnimationElement::VISIBILITY))
     return animator_->GetTargetVisibility();
   return visible_;
 }
 
 bool Layer::IsDrawn() const {
   const Layer* layer = this;
   while (layer && layer->visible_)
     layer = layer->parent_;
   return layer == NULL;
@@ skipping 43 matching lines @@
 
   cc_layer_->SetContentsOpaque(fills_bounds_opaquely);
 }
 
 void Layer::SetFillsBoundsCompletely(bool fills_bounds_completely) {
   fills_bounds_completely_ = fills_bounds_completely;
 }
 
 void Layer::SwitchToLayer(scoped_refptr<cc::Layer> new_layer) {
   // Finish animations being handled by cc_layer_.
-  if (animator_) {
+  if (animator_.get()) {
     animator_->StopAnimatingProperty(LayerAnimationElement::TRANSFORM);
     animator_->StopAnimatingProperty(LayerAnimationElement::OPACITY);
     animator_->SwitchToLayer(new_layer);
   }
 
   if (texture_layer_.get())
     texture_layer_->ClearClient();
 
   cc_layer_->RemoveAllChildren();
   if (cc_layer_->parent()) {
@@ skipping 86 matching lines @@
 
   scoped_refptr<cc::SurfaceLayer> new_layer =
       cc::SurfaceLayer::Create(satisfy_callback, require_callback);
   new_layer->SetSurfaceId(surface_id, scale, surface_size);
   SwitchToLayer(new_layer);
   surface_layer_ = new_layer;
 
   frame_size_in_dip_ = frame_size_in_dip;
   RecomputeDrawsContentAndUVRect();
 
-  for (const auto& mirror : mirrors_) {
-    mirror->dest()->SetShowSurface(
-        surface_id, satisfy_callback, require_callback,
-        surface_size, scale, frame_size_in_dip);
-  }
+  FOR_EACH_OBSERVER(LayerObserver, observer_list_, SurfaceChanged(this));
 }
 
 void Layer::SetShowSolidColorContent() {
   DCHECK_EQ(type_, LAYER_SOLID_COLOR);
 
   if (solid_color_layer_.get())
     return;
 
   scoped_refptr<cc::SolidColorLayer> new_layer = cc::SolidColorLayer::Create();
   SwitchToLayer(new_layer);
@@ skipping 36 matching lines @@
   nine_patch_layer_->SetBorder(border);
 }
 
 void Layer::UpdateNinePatchOcclusion(const gfx::Rect& occlusion) {
   DCHECK(type_ == LAYER_NINE_PATCH && nine_patch_layer_.get());
   nine_patch_layer_->SetLayerOcclusion(occlusion);
 }
 
 void Layer::SetColor(SkColor color) { GetAnimator()->SetColor(color); }
 
-SkColor Layer::GetTargetColor() const {
-  if (animator_ && animator_->IsAnimatingProperty(
-      LayerAnimationElement::COLOR))
-    return animator_->GetTargetColor();
+SkColor Layer::GetTargetColor() {
+  if (GetAnimator()->IsAnimatingProperty(LayerAnimationElement::COLOR))
+    return GetAnimator()->GetTargetColor();
   return cc_layer_->background_color();
 }
 
 SkColor Layer::background_color() const {
   return cc_layer_->background_color();
 }
 
 bool Layer::SchedulePaint(const gfx::Rect& invalid_rect) {
   if ((type_ == LAYER_SOLID_COLOR && !texture_layer_.get()) ||
       type_ == LAYER_NINE_PATCH || (!delegate_ && !mailbox_.IsValid()))
@@ skipping 46 matching lines @@
   if (!delegate_)
     return;
   delegate_ = NULL;
   for (size_t i = 0; i < children_.size(); ++i)
     children_[i]->SuppressPaint();
 }
 
 void Layer::OnDeviceScaleFactorChanged(float device_scale_factor) {
   if (device_scale_factor_ == device_scale_factor)
     return;
-  if (animator_)
+  if (animator_.get())
     animator_->StopAnimatingProperty(LayerAnimationElement::TRANSFORM);
   device_scale_factor_ = device_scale_factor;
   RecomputeDrawsContentAndUVRect();
   RecomputePosition();
   if (nine_patch_layer_) {
     UpdateNinePatchLayerImage(nine_patch_layer_image_);
     UpdateNinePatchLayerAperture(nine_patch_layer_aperture_);
   }
   SchedulePaint(gfx::Rect(bounds_.size()));
   if (delegate_)
@@ skipping 56 matching lines @@
   paint_region_.Clear();
   cc::DisplayItemListSettings settings;
   settings.use_cached_picture = false;
   scoped_refptr<cc::DisplayItemList> display_list =
       cc::DisplayItemList::Create(settings);
   if (delegate_) {
     delegate_->OnPaintLayer(
         PaintContext(display_list.get(), device_scale_factor_, invalidation));
   }
   display_list->Finalize();
-  // TODO(domlaskowski): Move mirror invalidation to Layer::SchedulePaint.
-  for (const auto& mirror : mirrors_)
-    mirror->dest()->SchedulePaint(invalidation);
+  FOR_EACH_OBSERVER(LayerObserver, observer_list_,
+                    DidPaintLayer(this, invalidation));
   return display_list;
 }
 
 bool Layer::FillsBoundsCompletely() const { return fills_bounds_completely_; }
 
 size_t Layer::GetApproximateUnsharedMemoryUsage() const {
   // Most of the "picture memory" is shared with the cc::DisplayItemList, so
   // there's nothing significant to report here.
   return 0;
 }
@@ skipping 99 matching lines @@
 
   if (was_move) {
     // Don't schedule a draw if we're invisible. We'll schedule one
     // automatically when we get visible.
     if (IsDrawn())
       ScheduleDraw();
   } else {
     // Always schedule a paint, even if we're invisible.
     SchedulePaint(gfx::Rect(bounds.size()));
   }
-
-  if (sync_bounds_) {
-    for (const auto& mirror : mirrors_)
-      mirror->dest()->SetBounds(bounds);
-  }
 }
 
 void Layer::SetTransformFromAnimation(const gfx::Transform& transform) {
   cc_layer_->SetTransform(transform);
 }
 
 void Layer::SetOpacityFromAnimation(float opacity) {
   cc_layer_->SetOpacity(opacity);
   ScheduleDraw();
 }
@@ skipping 140 matching lines @@
 
   if (animator_) {
     animator_->DetachLayerAndTimeline(compositor);
     animator_->RemoveFromCollection(collection);
   }
 
   for (auto* child : children_)
     child->ResetCompositorForAnimatorsInTree(compositor);
 }
 
-void Layer::OnMirrorDestroyed(LayerMirror* mirror) {
-  const auto it = std::find_if(mirrors_.begin(), mirrors_.end(),
-      [mirror](const std::unique_ptr<LayerMirror>& mirror_ptr) {
-        return mirror_ptr.get() == mirror;
-      });
-
-  DCHECK(it != mirrors_.end());
-  mirrors_.erase(it);
-}
-
 }  // namespace ui