Reland: Implement features in NativeViewHostAura for scroll end effect

ui/views/controls/native/native_view_host_aura.cc

Index: ui/views/controls/native/native_view_host_aura.cc
diff --git a/ui/views/controls/native/native_view_host_aura.cc b/ui/views/controls/native/native_view_host_aura.cc
index a71e230be4762b502b08d0537b547d599764a20e..a1072e75b0e145ff5400c6a2adddb66252df53c1 100644
--- a/ui/views/controls/native/native_view_host_aura.cc
+++ b/ui/views/controls/native/native_view_host_aura.cc
@@ -7,6 +7,7 @@
 #include "base/logging.h"
 #include "ui/aura/client/focus_client.h"
 #include "ui/aura/window.h"
+#include "ui/gfx/safe_integer_conversions.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/view_constants_aura.h"
 #include "ui/views/widget/widget.h"
@@ -15,31 +16,44 @@ namespace views {
 
 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
     : host_(host),
-      installed_clip_(false) {
+      installed_clip_(false),
+      clipping_window_(NULL) {
+  clipping_window_.SetTransparent(true);

[sky, 2013/10/22 19:57:32]

What necessitated all these changes?

[xiyuan, 2013/10/22 20:12:46]

This is to fix the views_unittest memory leak. The leak happens when closing a
widget that has a NativeView. Because
clipping_window_.set_owned_by_parent(false), it is not destroyed when the
containing widget is closed. And when we RemoveClippingWindow(), we only do
clipping_window_.RemoveChild(host_->native_view()) because the containing widget
is destroyed (GetWidget()->GetNativeView() returns NULL). This leaves
host_->native_view() as an orphan and leaked.

[sky, 2013/10/22 21:32:18]

Can you add a unit test to verify we don't leak?

[rharrison, 2013/10/24 14:40:15]

Done.

+  clipping_window_.Init(ui::LAYER_NOT_DRAWN);
+  clipping_window_.set_owned_by_parent(false);
+  clipping_window_.layer()->set_name("NativeViewHostAuraClip");
+  clipping_window_.layer()->SetMasksToBounds(false);
 }
 
 NativeViewHostAura::~NativeViewHostAura() {
   if (host_->native_view()) {
     host_->native_view()->ClearProperty(views::kHostViewKey);
     host_->native_view()->RemoveObserver(this);
+    RemoveClippingWindow();
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeViewHostAura, NativeViewHostWrapper implementation:
-void NativeViewHostAura::NativeViewWillAttach() {
+void NativeViewHostAura::AttachNativeView() {
   host_->native_view()->AddObserver(this);
   host_->native_view()->SetProperty(views::kHostViewKey,
       static_cast<View*>(host_));
+  AddClippingWindow();
 }
 
 void NativeViewHostAura::NativeViewDetaching(bool destroyed) {
   if (!destroyed) {
+    RemoveClippingWindow();
     host_->native_view()->ClearProperty(views::kHostViewKey);
     host_->native_view()->RemoveObserver(this);
     host_->native_view()->Hide();
     if (host_->native_view()->parent())
       Widget::ReparentNativeView(host_->native_view(), NULL);
+  } else {
+    clipping_window_.Hide();
+    if (clipping_window_.parent())
+      clipping_window_.parent()->RemoveChild(&clipping_window_);
   }
 }
 
@@ -47,9 +61,9 @@ void NativeViewHostAura::AddedToWidget() {
   if (!host_->native_view())
     return;
 
-  aura::Window* widget_window = host_->GetWidget()->GetNativeView();
-  if (host_->native_view()->parent() != widget_window)
-    widget_window->AddChild(host_->native_view());
+  if (host_->native_view()->parent() !=  host_->GetWidget()->GetNativeView())
+    AddClippingWindow();
+
   if (host_->IsDrawn())
     host_->native_view()->Show();
   else
@@ -60,15 +74,20 @@ void NativeViewHostAura::AddedToWidget() {
 void NativeViewHostAura::RemovedFromWidget() {
   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) {
-  // Note that this does not pose a problem functionality wise - it might
-  // however pose a speed degradation if not implemented.
-  LOG(WARNING) << "NativeViewHostAura::InstallClip is not implemented yet.";
+  installed_clip_ = true;
+  clip_rect_ = gfx::Rect(x + orig_bounds_.origin().x(),
+                         y + orig_bounds_.origin().y(),
+                         w,
+                         h);
+  UpdateClippingWindow();
+  clipping_window_.layer()->SetMasksToBounds(true);
 }
 
 bool NativeViewHostAura::HasInstalledClip() {
@@ -76,12 +95,25 @@ bool NativeViewHostAura::HasInstalledClip() {
 }
 
 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) {
-  // TODO: need to support fast resize.
-  host_->native_view()->SetBounds(gfx::Rect(x, y, w, h));
+  if (host_->fast_resize()) {
+    UninstallClip();
+    InstallClip(x - orig_bounds_.origin().x(),
+                y - orig_bounds_.origin().y(),
+                w,
+                h);
+  } else {
+    clip_rect_.Offset(x - orig_bounds_.origin().x(),
+                      y - orig_bounds_.origin().y());
+    orig_bounds_ = gfx::Rect(x, y, w, h);
+    UpdateClippingWindow();
+  }
   host_->native_view()->Show();
 }
 
@@ -111,4 +143,65 @@ NativeViewHostWrapper* NativeViewHostWrapper::CreateWrapper(
   return new NativeViewHostAura(host);
 }
 
+gfx::Point NativeViewHostAura::CalculateNativeViewOrigin(
+    const gfx::Rect& input_rect,
+    const gfx::Rect& native_rect) const {
+  int new_x = gfx::ToRoundedInt(host_->GetWidthScaleFactor() *
+                                (input_rect.width() -
+                                 native_rect.width()));
+  int new_y = gfx::ToRoundedInt(host_->GetHeightScaleFactor() *
+                                (input_rect.height() -
+                                 native_rect.height()));
+  return gfx::Point(new_x, new_y);
+}
+
+void NativeViewHostAura::AddClippingWindow() {
+  gfx::Rect bounds = host_->native_view()->bounds();
+  orig_bounds_ = bounds;
+
+  if (host_->GetWidget()->GetNativeView()) {
+    Widget::ReparentNativeView(&clipping_window_,
+                               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() {
+  if (host_->native_view()->parent() == &clipping_window_) {
+    if (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());
+  }
+  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);
+
+    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()));
+  }
+}
+
 }  // namespace views