patch from issue 24299004

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 444f5803e687830df18efb39ca68f2bf5f51a3b0..e1e193598e5c0dbd6f2e1d4b5d498b617f6e29ca 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/focus_manager.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,29 +16,40 @@ namespace views {
 
 NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
     : host_(host),
-      installed_clip_(false) {
+      installed_clip_(false),
+      clipping_window_(NULL) {
+    clipping_window_.SetTransparent(true);
+    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) {
+  RemoveClippingWindow();
   if (!destroyed) {
     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);
   }
@@ -47,9 +59,10 @@ 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 +73,18 @@ 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, y, w, h);
+  UpdateClippingWindow();
+  clipping_window_.layer()->SetMasksToBounds(true);
 }
 
 bool NativeViewHostAura::HasInstalledClip() {
@@ -76,12 +92,34 @@ bool NativeViewHostAura::HasInstalledClip() {
 }
 
 void NativeViewHostAura::UninstallClip() {
+  if (installed_clip_ == false)
+    return;
+
+  clipping_window_.layer()->SetMasksToBounds(false);
+  clipping_window_.layer()->SetBounds(orig_bounds_);
+  gfx::Rect layer_bounds = orig_bounds_;
+  layer_bounds.set_origin(gfx::Point(0,0));
+  host_->native_view()->layer()->SetBounds(layer_bounds);
+
   installed_clip_ = 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()) {
+    gfx::Rect bounds = host_->native_view()->layer()->bounds();
+    gfx::Point native_origin =
+        CalculateNativeViewOrigin(gfx::Rect(0, 0, w, h), bounds);
+    orig_bounds_ = gfx::Rect(x + native_origin.x(),
+                             y + native_origin.y(),
+                             bounds.width(),
+                             bounds.height());
+
+    UninstallClip();
+    InstallClip(-native_origin.x(), -native_origin.y(), w, h);
+  } else {
+    orig_bounds_ = gfx::Rect(x, y, w, h);
+    UpdateClippingWindow();
+  }
   host_->native_view()->Show();
 }
 
@@ -101,8 +139,8 @@ gfx::NativeViewAccessible NativeViewHostAura::GetNativeViewAccessible() {
 }
 
 void NativeViewHostAura::OnWindowDestroyed(aura::Window* window) {
-  DCHECK(window == host_->native_view());
-  host_->NativeViewDestroyed();
+  if (window == host_->native_view())
+    host_->NativeViewDestroyed();
 }
 
 // static
@@ -111,4 +149,62 @@ 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();
+
+  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());
+    }
+
+    clipping_window_.Hide();
+    host_->native_view()->SetBounds(clipping_window_.bounds());
+    if (clipping_window_.parent())
+      clipping_window_.parent()->RemoveChild(&clipping_window_);
+  }
+}
+
+void NativeViewHostAura::UpdateClippingWindow() {
+  if (installed_clip_) {
+    gfx::Rect clip_bounds(clip_rect_);
+    clip_bounds.Offset(orig_bounds_.x(), orig_bounds_.y());
+    clipping_window_.SetBounds(clip_bounds);
+    host_->native_view()->SetBounds(
+        gfx::Rect(-clip_rect_.x(), -clip_rect_.y(),
+                  orig_bounds_.width(), orig_bounds_.height()));
+  } else {
+    clipping_window_.SetBounds(orig_bounds_);
+    host_->native_view()->SetBounds(gfx::Rect(orig_bounds_.size()));
+  }
+}
+
 }  // namespace views