Fix positioning of children of NativeViewHostAura

ui/views/controls/native/native_view_host_aura.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.
 
 #include "ui/views/controls/native/native_view_host_aura.h"
 
 #include "base/logging.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
     : host_(host),
       clipping_window_(NULL) {
+  clipping_window_.SetType(ui::wm::WINDOW_TYPE_CONTROL);

[sky, 2014/07/22 22:36:59]

As this is so subtle I was hoping for a comment here.

[Evan Stade, 2014/07/22 22:41:19]

I will add one.

   clipping_window_.Init(aura::WINDOW_LAYER_NOT_DRAWN);
   clipping_window_.set_owned_by_parent(false);
   clipping_window_.SetName("NativeViewHostAuraClip");
   clipping_window_.layer()->SetMasksToBounds(true);
   clipping_window_.SetProperty(views::kHostViewKey, static_cast<View*>(host_));
 }
 
 NativeViewHostAura::~NativeViewHostAura() {
   if (host_->native_view()) {
     host_->native_view()->RemoveObserver(this);
@@ skipping 109 matching lines @@
 // static
 NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
     NativeViewHost* host) {
   return new NativeViewHostAura(host);
 }
 
 void NativeViewHostAura::AddClippingWindow() {
   RemoveClippingWindow();
 
   gfx::Rect bounds = host_->native_view()->bounds();
+  Widget::ReparentNativeView(host_->native_view(),

[sky, 2014/07/22 22:36:59]

Did you intend to include this?

[Evan Stade, 2014/07/22 22:41:19]

no

+                             &clipping_window_);
   if (host_->GetWidget()->GetNativeView()) {
     Widget::ReparentNativeView(&clipping_window_,
                                host_->GetWidget()->GetNativeView());
   }
   host_->native_view()->SetProperty(aura::client::kHostWindowKey,
       host_->GetWidget()->GetNativeView());
-  Widget::ReparentNativeView(host_->native_view(),
-                             &clipping_window_);
   clipping_window_.SetBounds(bounds);
   bounds.set_origin(gfx::Point(0, 0));
   host_->native_view()->SetBounds(bounds);
   clipping_window_.Show();
 }
 
 void NativeViewHostAura::RemoveClippingWindow() {
   clipping_window_.Hide();
   if (host_->native_view())
     host_->native_view()->ClearProperty(aura::client::kHostWindowKey);
 
   if (host_->native_view()->parent() == &clipping_window_) {
     if (host_->GetWidget() && host_->GetWidget()->GetNativeView()) {
       Widget::ReparentNativeView(host_->native_view(),
                                  host_->GetWidget()->GetNativeView());
     } else {
       clipping_window_.RemoveChild(host_->native_view());
     }
     host_->native_view()->SetBounds(clipping_window_.bounds());
   }
   if (clipping_window_.parent())
     clipping_window_.parent()->RemoveChild(&clipping_window_);
 }
 
 }  // namespace views