aura: Fix NativeViewHostAura non fast resize clipping.

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/focus_manager.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/safe_integer_conversions.h"
@@ skipping 64 matching lines @@
   if (host_->native_view()) {
     host_->native_view()->Hide();
     RemoveClippingWindow();
     if (host_->native_view()->parent())
       host_->native_view()->parent()->RemoveChild(host_->native_view());
   }
 }
 
 void NativeViewHostAura::InstallClip(int x, int y, int w, int h) {
   installed_clip_ = true;
-  clip_rect_ = gfx::Rect(x + orig_bounds_.origin().x(),
-                         y + orig_bounds_.origin().y(),
+  clip_rect_ = gfx::Rect(x + orig_bounds_.x(),
+                         y + orig_bounds_.y(),
                          w,
                          h);
   UpdateClippingWindow();
   clipping_window_.layer()->SetMasksToBounds(true);
 }
 
 bool NativeViewHostAura::HasInstalledClip() {
   return installed_clip_;
 }
 
 void NativeViewHostAura::UninstallClip() {
   if (installed_clip_ == false)
     return;
   installed_clip_ = false;
   clipping_window_.layer()->SetMasksToBounds(false);
 }
 
 void NativeViewHostAura::ShowWidget(int x, int y, int w, int h) {
   if (host_->fast_resize()) {
-    UninstallClip();
-    InstallClip(x - orig_bounds_.origin().x(),
-                y - orig_bounds_.origin().y(),
+    gfx::Rect native_view_bounds = host_->native_view()->bounds();
+    gfx::Point native_view_origin =
+        CalculateNativeViewOrigin(clipping_window_.bounds(),
+                                  native_view_bounds);
+    orig_bounds_ = gfx::Rect(x + native_view_origin.x(),
+                             y + native_view_origin.y(),
+                             native_view_bounds.width(),
+                             native_view_bounds.height());
+
+    InstallClip(x - orig_bounds_.x(),
+                y - orig_bounds_.y(),
                 w,
                 h);
   } else {
-    clip_rect_.Offset(x - orig_bounds_.origin().x(),
-                      y - orig_bounds_.origin().y());
+    clip_rect_.Offset(x - orig_bounds_.x(), y - orig_bounds_.y());
     orig_bounds_ = gfx::Rect(x, y, w, h);
     UpdateClippingWindow();
   }
   host_->native_view()->Show();
 }
 
 void NativeViewHostAura::HideWidget() {
   host_->native_view()->Hide();
 }
 
@@ skipping 57 matching lines @@
       clipping_window_.RemoveChild(host_->native_view());
     }
     host_->native_view()->SetBounds(clipping_window_.bounds());
   }
   clipping_window_.Hide();
   if (clipping_window_.parent())
     clipping_window_.parent()->RemoveChild(&clipping_window_);
 }
 
 void NativeViewHostAura::UpdateClippingWindow() {
-  if (installed_clip_) {
-    clipping_window_.SetBounds(clip_rect_);
-    gfx::Rect native_view_bounds = host_->native_view()->bounds();
-    gfx::Point native_view_origin =
-        CalculateNativeViewOrigin(clipping_window_.bounds(),
-                                  native_view_bounds);
+  if (!installed_clip_)
+    clip_rect_ = orig_bounds_;
 
-    native_view_bounds.set_origin(native_view_origin);
-    host_->native_view()->SetBounds(native_view_bounds);
-  } else {
-    clip_rect_ = orig_bounds_;
-    clipping_window_.SetBounds(orig_bounds_);
-    host_->native_view()->SetBounds(gfx::Rect(orig_bounds_.size()));
-  }
+  clipping_window_.SetBounds(clip_rect_);
+
+  gfx::Rect native_view_bounds = orig_bounds_;
+  native_view_bounds.Offset(-clip_rect_.x(), -clip_rect_.y());
+  host_->native_view()->SetBounds(native_view_bounds);
 }
 
 }  // namespace views