Rename Widget::CalculateOffsetToAncestorWithLayer() to Widget::GetLayer()

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 1356 matching lines @@
       *layer_parent = layer();
     return gfx::Vector2d();
   }
   if (!parent_)
     return gfx::Vector2d();
 
   return gfx::Vector2d(GetMirroredX(), y()) +
       parent_->CalculateOffsetToAncestorWithLayer(layer_parent);
 }
 
+void View::UpdateParentLayer() {
+  if (!layer())
+    return;
+
+  ui::Layer* parent_layer = NULL;
+  gfx::Vector2d offset(GetMirroredX(), y());
+
+  if (parent_)
+    offset += parent_->CalculateOffsetToAncestorWithLayer(&parent_layer);
+
+  ReparentLayer(offset, parent_layer);
+}
+
 void View::MoveLayerToParent(ui::Layer* parent_layer,
                              const gfx::Point& point) {
   gfx::Point local_point(point);
   if (parent_layer != layer())
     local_point.Offset(GetMirroredX(), y());
   if (layer() && parent_layer != layer()) {
     parent_layer->Add(layer());
     SetLayerBounds(gfx::Rect(local_point.x(), local_point.y(),
                              width(), height()));
   } else {
@@ skipping 45 matching lines @@
 
 base::Closure View::PrepareForLayerBoundsChange() {
   return base::Closure();
 }
 
 void View::ReorderLayers() {
   View* v = this;
   while (v && !v->layer())
     v = v->parent();
 
-  // Forward to widget in case we're in a NativeWidgetAura.
   if (!v) {
-    if (GetWidget())
-      GetWidget()->ReorderLayers();
+    Widget* widget = GetWidget();
+    if (widget) {
+      ui::Layer* layer = widget->GetLayer();
+      if (layer)
+        widget->GetRootView()->ReorderChildLayers(layer);
+    }
   } else {
-    for (Views::const_iterator i(v->children_.begin());
-         i != v->children_.end();
-         ++i)
-      (*i)->ReorderChildLayers(v->layer());
+    v->ReorderChildLayers(v->layer());
   }
 }
 
 void View::ReorderChildLayers(ui::Layer* parent_layer) {
-  if (layer()) {
+  if (layer() && layer() != parent_layer) {
     DCHECK_EQ(parent_layer, layer()->parent());
     parent_layer->StackAtTop(layer());
   } else {
     for (Views::const_iterator i(children_.begin()); i != children_.end(); ++i)
       (*i)->ReorderChildLayers(parent_layer);
   }
 }
 
 // Input -----------------------------------------------------------------------
 
@@ skipping 547 matching lines @@
 void View::UpdateParentLayers() {
   // Attach all top-level un-parented layers.
   if (layer() && !layer()->parent()) {
     UpdateParentLayer();
   } else {
     for (int i = 0, count = child_count(); i < count; ++i)
       child_at(i)->UpdateParentLayers();
   }
 }
 
-void View::UpdateParentLayer() {
-  if (!layer())
-    return;
-
-  ui::Layer* parent_layer = NULL;
-  gfx::Vector2d offset(GetMirroredX(), y());
-
-  // TODO(sad): The NULL check here for parent_ essentially is to check if this
-  // is the RootView. Instead of doing this, this function should be made
-  // virtual and overridden from the RootView.
-  if (parent_)
-    offset += parent_->CalculateOffsetToAncestorWithLayer(&parent_layer);
-  else if (!parent_ && GetWidget())
-    offset += GetWidget()->CalculateOffsetToAncestorWithLayer(&parent_layer);
-
-  ReparentLayer(offset, parent_layer);
-}
-
 void View::OrphanLayers() {
   if (layer()) {
     if (layer()->parent())
       layer()->parent()->Remove(layer());
 
     // The layer belonging to this View has already been orphaned. It is not
     // necessary to orphan the child layers.
     return;
   }
   for (int i = 0, count = child_count(); i < count; ++i)
@@ skipping 247 matching lines @@
   ConvertPointToWidget(this, &widget_location);
   GetWidget()->RunShellDrag(this, data, widget_location, drag_operations,
       source);
   return true;
 #else
   return false;
 #endif  // !defined(OS_MACOSX)
 }
 
 }  // namespace views