Revert of [M55] Generalize layer mirroring for phantom windows

ui/compositor/layer.h

 // 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.
 
 #ifndef UI_COMPOSITOR_LAYER_H_
 #define UI_COMPOSITOR_LAYER_H_
 
 #include <stddef.h>
 
 #include <memory>
@@ skipping 58 matching lines @@
 class COMPOSITOR_EXPORT Layer
     : public LayerAnimationDelegate,
       NON_EXPORTED_BASE(public cc::ContentLayerClient),
       NON_EXPORTED_BASE(public cc::TextureLayerClient),
       NON_EXPORTED_BASE(public cc::LayerClient) {
  public:
   Layer();
   explicit Layer(LayerType type);
   ~Layer() override;
 
-  // Note that only solid color and surface content is copied.
-  std::unique_ptr<Layer> Clone() const;
-
-  // Returns a new layer that mirrors this layer and is optionally synchronized
-  // with the bounds thereof. Note that children are not mirrored, and that the
-  // content is only mirrored if painted by a delegate or backed by a surface.
-  std::unique_ptr<Layer> Mirror();
-
-  void set_sync_bounds(bool sync_bounds) { sync_bounds_ = sync_bounds; }
-
   // Retrieves the Layer's compositor. The Layer will walk up its parent chain
   // to locate it. Returns NULL if the Layer is not attached to a compositor.
   Compositor* GetCompositor() {
     return const_cast<Compositor*>(
         const_cast<const Layer*>(this)->GetCompositor());
   }
   const Compositor* GetCompositor() const;
 
   // Called by the compositor when the Layer is set as its root Layer. This can
   // only ever be called on the root layer.
@@ skipping 207 matching lines @@
 
   bool has_external_content() {
     return texture_layer_.get() || surface_layer_.get();
   }
 
   // Show a solid color instead of delegated or surface contents.
   void SetShowSolidColorContent();
 
   // Sets the layer's fill color.  May only be called for LAYER_SOLID_COLOR.
   void SetColor(SkColor color);
-  SkColor GetTargetColor() const;
+  SkColor GetTargetColor();
   SkColor background_color() const;
 
   // Updates the nine patch layer's image, aperture and border. May only be
   // called for LAYER_NINE_PATCH.
   void UpdateNinePatchLayerImage(const gfx::ImageSkia& image);
   void UpdateNinePatchLayerAperture(const gfx::Rect& aperture_in_dip);
   void UpdateNinePatchLayerBorder(const gfx::Rect& border);
   // Updates the area completely occluded by another layer, this can be an
   // empty rectangle if nothing is occluded.
   void UpdateNinePatchOcclusion(const gfx::Rect& occlusion);
@@ skipping 59 matching lines @@
 
   // Triggers a call to SwitchToLayer.
   void SwitchCCLayerForTest();
 
   const cc::Region& damaged_region_for_testing() const {
     return damaged_region_;
   }
 
  private:
   friend class LayerOwner;
-  class LayerMirror;
 
   void CollectAnimators(std::vector<scoped_refptr<LayerAnimator> >* animators);
 
   // Stacks |child| above or below |other|.  Helper method for StackAbove() and
   // StackBelow().
   void StackRelativeTo(Layer* child, Layer* other, bool above);
 
   bool ConvertPointForAncestor(const Layer* ancestor, gfx::Point* point) const;
   bool ConvertPointFromAncestor(const Layer* ancestor, gfx::Point* point) const;
 
@@ skipping 30 matching lines @@
 
   // Set all filters which got applied to the layer background.
   void SetLayerBackgroundFilters();
 
   // Cleanup |cc_layer_| and replaces it with |new_layer|.
   void SwitchToLayer(scoped_refptr<cc::Layer> new_layer);
 
   void SetCompositorForAnimatorsInTree(Compositor* compositor);
   void ResetCompositorForAnimatorsInTree(Compositor* compositor);
 
-  void OnMirrorDestroyed(LayerMirror* mirror);
-
   const LayerType type_;
 
   Compositor* compositor_;
 
   Layer* parent_;
 
   // This layer's children, in bottom-to-top stacking order.
   std::vector<Layer*> children_;
 
-  std::vector<std::unique_ptr<LayerMirror>> mirrors_;
-
-  // If true, changes to the bounds of this layer are propagated to mirrors.
-  bool sync_bounds_ = false;
-
   gfx::Rect bounds_;
   gfx::Vector2dF subpixel_position_offset_;
 
   // Visibility of this layer. See SetVisible/IsDrawn for more details.
   bool visible_;
 
   bool fills_bounds_opaquely_;
   bool fills_bounds_completely_;
 
   // Union of damaged rects, in layer space, that SetNeedsDisplayRect should
@@ skipping 67 matching lines @@
   // The size of the frame or texture in DIP, set when SetShowDelegatedContent
   // or SetTextureMailbox was called.
   gfx::Size frame_size_in_dip_;
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_COMPOSITOR_LAYER_H_