Implement NativeViewHostAura::InstallClip.

ui/views/controls/native/native_view_host_aura_unittest.cc

 // Copyright (c) 2013 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/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/window.h"
 #include "ui/base/cursor/cursor.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/widget.h"
 
 namespace views {
 
+// Testing wrapper of the NativeViewHost
+class NativeViewHostTesting : public NativeViewHost {
+ public:
+  NativeViewHostTesting() {}
+  virtual ~NativeViewHostTesting() { destroyed_count_++; }
+
+  static void ResetDestroyedCount() { destroyed_count_ = 0; }
+
+  static int destroyed_count() { return destroyed_count_; }
+
+ private:
+  static int destroyed_count_;
+};

[sky, 2014/06/05 15:49:01]

DISALLOW_...

[calamity, 2014/06/06 08:13:44]

Done.

+int NativeViewHostTesting::destroyed_count_ = 0;
+
 class NativeViewHostAuraTest : public ViewsTestBase {
  public:
   NativeViewHostAuraTest() {
   }
 
   NativeViewHostAura* native_host() {
     return static_cast<NativeViewHostAura*>(host_->native_wrapper_.get());
   }
 
   Widget* toplevel() {
     return toplevel_.get();
   }
 
   NativeViewHost* host() {
     return host_.get();
   }
 
   Widget* child() {
     return child_.get();
   }
 
+  aura::Window* clipping_window() { return &(native_host()->clipping_window_); }
+
   void CreateHost() {
     // Create the top level widget.
     toplevel_.reset(new Widget);
     Widget::InitParams toplevel_params =
         CreateParams(Widget::InitParams::TYPE_WINDOW);
     toplevel_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     toplevel_->Init(toplevel_params);
 
     // And the child widget.
     View* test_view = new View;
     child_.reset(new Widget);
     Widget::InitParams child_params(Widget::InitParams::TYPE_CONTROL);
     child_params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
     child_params.parent = toplevel_->GetNativeView();
     child_->Init(child_params);
     child_->SetContentsView(test_view);
 
     // Owned by |toplevel|.
-    host_.reset(new NativeViewHost);
+    host_.reset(new NativeViewHostTesting);
     toplevel_->GetRootView()->AddChildView(host_.get());
     host_->Attach(child_->GetNativeView());
   }
 
   void DestroyHost() {
     host_.reset();
   }
 
+  NativeViewHostTesting* ReleaseHost() { return host_.release(); }
+
+  void DestroyTopLevel() { toplevel_.reset(); }
+
  private:
   scoped_ptr<Widget> toplevel_;
-  scoped_ptr<NativeViewHost> host_;
+  scoped_ptr<NativeViewHostTesting> host_;
   scoped_ptr<Widget> child_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeViewHostAuraTest);
 };
 
 // Verifies NativeViewHostAura stops observing native view on destruction.
 TEST_F(NativeViewHostAuraTest, StopObservingNativeViewOnDestruct) {
   CreateHost();
   aura::Window* child_win = child()->GetNativeView();
   NativeViewHostAura* aura_host = native_host();
@@ skipping 27 matching lines @@
   toplevel()->SetCursor(ui::kCursorHand);
   child()->SetCursor(ui::kCursorWait);
   ui::MouseEvent move_event(ui::ET_MOUSE_MOVED, gfx::Point(0, 0),
                             gfx::Point(0, 0), 0, 0);
 
   EXPECT_EQ(ui::kCursorWait, host()->GetCursor(move_event).native_type());
 
   DestroyHost();
 }
 
+// Test that the fast resize path places the clipping and content windows were
+// they are supposed to be.
+TEST_F(NativeViewHostAuraTest, FastResizePath) {
+  CreateHost();
+
+  host()->set_fast_resize(false);
+  toplevel()->SetBounds(gfx::Rect(20, 20, 100, 100));
+  native_host()->ShowWidget(0, 0, 100, 100);
+  EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
+            host()->native_view()->layer()->bounds().ToString());
+
+  host()->set_fast_resize(true);
+  native_host()->ShowWidget(10, 25, 50, 50);
+  EXPECT_EQ(gfx::Rect(0, 0, 100, 100).ToString(),
+            host()->native_view()->layer()->bounds().ToString());
+  EXPECT_EQ(gfx::Rect(10, 25, 50, 50).ToString(),
+            clipping_window()->layer()->bounds().ToString());
+
+  DestroyHost();
+}
+
+// Test that destroying the top level widget before destroying the attached
+// NativeViewHost works correctly. Specifically the associated NVH should be
+// destroyed and there shouldn't be any errors.
+TEST_F(NativeViewHostAuraTest, DestroyWidget) {
+  NativeViewHostTesting::ResetDestroyedCount();
+  CreateHost();
+  ReleaseHost();
+  EXPECT_EQ(0, NativeViewHostTesting::destroyed_count());
+  DestroyTopLevel();
+  EXPECT_EQ(1, NativeViewHostTesting::destroyed_count());
+}
+
 }  // namespace views