Reorder the NativeViews attached to a view via kViewHostKey according to the position of the view

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 517 matching lines @@
     DestroyLayer();
   }
 }
 
 ui::Layer* View::RecreateLayer() {
   ui::Layer* layer = AcquireLayer();
   if (!layer)
     return NULL;
 
   CreateLayer();
-
-  // TODO(pkotwicz): Remove this once ReorderLayers() stacks layers not attached
-  // to a view above layers attached to a view.
-  if (layer->parent())
-    layer->parent()->StackAtTop(layer);
-
   layer_->set_scale_content(layer->scale_content());
   return layer;
 }
 
 // RTL positioning -------------------------------------------------------------
 
 gfx::Rect View::GetMirroredBounds() const {
   gfx::Rect bounds(bounds_);
   bounds.set_x(GetMirroredX());
   return bounds;
@@ skipping 897 matching lines @@
 
 base::Closure View::PrepareForLayerBoundsChange() {
   return base::Closure();
 }
 
 void View::ReorderLayers() {
   View* v = this;
   while (v && !v->layer())
     v = v->parent();
 
+  Widget* widget = GetWidget();
   if (!v) {
-    Widget* widget = GetWidget();
     if (widget) {
       ui::Layer* layer = widget->GetLayer();
       if (layer)
         widget->GetRootView()->ReorderChildLayers(layer);
     }
   } else {
     v->ReorderChildLayers(v->layer());
   }
+
+  if (widget) {
+    // Reorder layers for NativeViews attached to a view (eg via a
+    // NativeViewHost). Always do the reordering because the attached
+    // NativeView's layer is parented to the widget's layer regardless of
+    // whether the host view has an ancestor with a layer.
+    widget->ReorderLayersForAttachedNativeViews();
+  }
 }
 
 void View::ReorderChildLayers(ui::Layer* parent_layer) {
   if (layer() && layer() != parent_layer) {

[sky, 2013/05/24 15:57:26]

It's subtle that we iterate backward. And subtle code is worth a comment.

[pkotwicz, 2013/05/26 04:12:15]

Done.

     DCHECK_EQ(parent_layer, layer()->parent());
-    parent_layer->StackAtTop(layer());
+    parent_layer->StackAtBottom(layer());
   } else {
-    for (Views::const_iterator i(children_.begin()); i != children_.end(); ++i)
-      (*i)->ReorderChildLayers(parent_layer);
+    for (Views::const_reverse_iterator it(children_.rbegin());
+         it != children_.rend(); ++it) {
+      (*it)->ReorderChildLayers(parent_layer);
+    }
   }
 }
 
 // Input -----------------------------------------------------------------------
 
 bool View::HasHitTestMask() const {
   return false;
 }
 
 void View::GetHitTestMask(gfx::Path* mask) const {
@@ skipping 809 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