Optimize View::UpdateRootBounds

ui/views/view.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.
 
 #define _USE_MATH_DEFINES // For VC++ to get M_PI. This has to be first.
 
 #include "ui/views/view.h"
 
 #include <algorithm>
 #include <cmath>
@@ skipping 399 matching lines @@
 
     // Notify the parent.
     if (parent_)
       parent_->ChildVisibilityChanged(this);
 
     // This notifies all sub-views recursively.
     PropagateVisibilityNotifications(this, visible_);
     UpdateLayerVisibility();
 
     // If we are newly visible, schedule paint.
-    if (visible_)
+    if (visible_) {
       SchedulePaint();
+    } else {
+      // We're never painted when hidden, so no need to be in the BoudsTree.

[tfarina, 2014/09/15 18:02:09]

s/BoudsTree/BoundsTree

+      BoundsTree* bounds_tree = GetBoundsTreeFromPaintRoot();
+      if (bounds_tree)
+        RemoveRootBounds(bounds_tree);
+    }
   }
 }
 
 bool View::IsDrawn() const {
   return visible_ && parent_ ? parent_->IsDrawn() : false;
 }
 
 void View::SetEnabled(bool enabled) {
   if (enabled != enabled_) {
     enabled_ = enabled;
@@ skipping 1572 matching lines @@
     // coordinates in paint root space have changed since ours have changed.
     for (Views::const_iterator i(children_.begin()); i != children_.end();
          ++i) {
       if (!(*i)->IsPaintRoot())
         (*i)->SetRootBoundsDirty(origin_changed);
     }
   }
 }
 
 void View::UpdateRootBounds(BoundsTree* tree, const gfx::Vector2d& offset) {
+  // If we're not visible no need to update BoundsTree. When we are made visible
+  // the BoundsTree will be updated appropriately.
+  if (!visible_)
+    return;
+
+  if (!root_bounds_dirty_ && children_.empty())
+    return;
+
   // No need to recompute bounds if we haven't flagged ours as dirty.
   TRACE_EVENT1("views", "View::UpdateRootBounds", "class", GetClassName());
 
   // Add our own offset to the provided offset, for our own bounds update and
   // for propagation to our children if needed.
   gfx::Vector2d view_offset = offset + GetMirroredBounds().OffsetFromOrigin();
 
   // If our bounds have changed we must re-insert our new bounds to the tree.
   if (root_bounds_dirty_) {
     root_bounds_dirty_ = false;
@@ skipping 418 matching lines @@
   // Message the RootView to do the drag and drop. That way if we're removed
   // the RootView can detect it and avoid calling us back.
   gfx::Point widget_location(event.location());
   ConvertPointToWidget(this, &widget_location);
   widget->RunShellDrag(this, data, widget_location, drag_operations, source);
   // WARNING: we may have been deleted.
   return true;
 }
 
 }  // namespace views