Improve Aura overdraw by changing hole calculation

ui/gfx/compositor/layer.h

 // Copyright (c) 2011 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_GFX_COMPOSITOR_LAYER_H_
 #define UI_GFX_COMPOSITOR_LAYER_H_
 #pragma once
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContentLayer.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebContentLayerClient.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebLayerClient.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/transform.h"
 #include "ui/gfx/compositor/compositor.h"
 #include "ui/gfx/compositor/layer_animation_manager.h"
 #include "ui/gfx/compositor/layer_animator_delegate.h"
 #include "ui/gfx/compositor/layer_delegate.h"
 
 class SkCanvas;
 
+namespace {

[sky, 2011/10/25 21:44:09]

Move this to the private section of Layer.

+
+// contains info for a layer with respect to the root layer.

[sky, 2011/10/25 21:44:09]

Contains

+struct LayerProperties {
+ public:

[sky, 2011/10/25 21:44:09]

don't use a public section with structs.

+  ui::Layer* layer;
+  ui::Transform transform_relative_to_root;
+  float combined_opacity;
+
+  // Copy and assignment are allowed.

[sky, 2011/10/25 21:44:09]

Remove this comment. Generally when we use structs in the code we want
copy/assignment, so you would only comment if you didn't want them.

+};
+
+} // namespace
+
 namespace ui {
 
 class Animation;
 class Compositor;
 class Texture;
 
 // Layer manages a texture, transform and a set of child Layers. Any View that
 // has enabled layers ends up creating a Layer to manage the texture.
 // A Layer can also be created without a texture, in which case it renders
 // nothing and is simply used as a node in a hierarchy of layers.
@@ skipping 155 matching lines @@
   // TODO(vollick): Eventually, if a non-leaf node has an opacity of less than
   // 1.0, we'll render to a separate texture, and then apply the alpha.
   // Currently, we multiply our opacity by all our ancestor's opacities and
   // use the combined result, but this is only temporary.
   float GetCombinedOpacity() const;
 
   // Called during the Draw() pass to freshen the Layer's contents from the
   // delegate.
   void UpdateLayerCanvas();
 
+  // Called to indicate that a layer's properties have changed and that the
+  // holes for the layers must be recomputed.
+  void SetNeedsToRecomputeHole();
+
+  // Resets |hole_rect_| to the empty rect for all layers below and
+  // including this one.
+  void ClearHoleRects();
+
+  // Does a preorder traversal of layers starting with this layer. Omits layers
+  // which cannot punch a hole in another layer such as non visible layers
+  // and layers which don't fill their bounds opaquely.
+  void GeneratePreorderTraversal(std::vector<LayerProperties>* layer_traversal,
+      const ui::Transform& current_transform, float current_opacity);

[sky, 2011/10/25 21:44:09]

When you wrap, you want each argument on its own line. Also, the style guide
says out params should be last.
And I think this method should be renamed to something like GetLayerProperties

+
   // A hole in a layer is an area in the layer that does not get drawn
   // because this area is covered up with another layer which is known to be
   // opaque.
   // This method computes the dimension of the hole (if there is one)
   // based on whether one of its child nodes is always opaque.
-  // Note: For simplicity's sake, currently a hole is only created if the child
-  // view has no transform with respect to its parent.
+  // Note: This method should only be called from the root.
   void RecomputeHole();
 
-  // Returns true if the layer paints every pixel (fills_bounds_opaquely)
-  // and the alpha of the layer is 1.0f.
-  bool IsCompletelyOpaque() const;
+  void set_hole_rect(const gfx::Rect& hole_rect) {
+    hole_rect_ = hole_rect;
+  }
 
   // Determines the regions that don't intersect |rect| and places the
   // result in |sides|.
   //
   //  rect_____________________________
   //  |xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx|
   //  |xxxxxxxxxxxxx top xxxxxxxxxxxxxx|
   //  |________________________________|
   //  |xxxxx|                    |xxxxx|
   //  |xxxxx|region_to_punch_out |xxxxx|
   //  |left |                    |right|
   //  |_____|____________________|_____|
   //  |xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx|
   //  |xxxxxxxxxx bottom xxxxxxxxxxxxxx|
   //  |________________________________|
   static void PunchHole(const gfx::Rect& rect,
                         const gfx::Rect& region_to_punch_out,
                         std::vector<gfx::Rect>* sides);
 
+  // Drops texture just for this layer.
+  void DropTexture();
+
   // Drop all textures for layers below and including this one. Called when
   // the layer is removed from a hierarchy. Textures will be re-generated if
   // the layer is subsequently re-attached and needs to be drawn.
   void DropTextures();
 
   bool ConvertPointForAncestor(const Layer* ancestor, gfx::Point* point) const;
   bool ConvertPointFromAncestor(const Layer* ancestor, gfx::Point* point) const;
 
   bool GetTransformRelativeTo(const Layer* ancestor,
                               Transform* transform) const;
@@ skipping 40 matching lines @@
 
   gfx::Rect bounds_;
 
   // Visibility of this layer. See SetVisible/IsDrawn for more details.
   bool visible_;
 
   bool fills_bounds_opaquely_;
 
   gfx::Rect hole_rect_;
 
+  bool recompute_hole_;
+
   gfx::Rect invalid_rect_;
 
   // If true the layer is always up to date.
   bool layer_updated_externally_;
 
   float opacity_;
 
   LayerDelegate* delegate_;
 
   scoped_ptr<LayerAnimationManager> animator_;
 
 #if defined(USE_WEBKIT_COMPOSITOR)
   WebKit::WebContentLayer web_layer_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(Layer);
 };
 
 }  // namespace ui
 
 #endif  // UI_GFX_COMPOSITOR_LAYER_H_