Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(739)

Unified Diff: ui/views/controls/native/native_view_host_aura.cc

Issue 30993004: Reland: Implement features in NativeViewHostAura for scroll end effect (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed outstanding issues from original CL Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..e6b408462e49ae9bff1dec24483d103673ec4bfa 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,8 +16,8 @@ namespace views {
NativeViewHostAura::NativeViewHostAura(NativeViewHost* host)
: host_(host),
- installed_clip_(false) {
-}
+ installed_clip_(false),
+ clipping_window_(NULL) {}
NativeViewHostAura::~NativeViewHostAura() {
if (host_->native_view()) {
@@ -27,10 +28,11 @@ NativeViewHostAura::~NativeViewHostAura() {
////////////////////////////////////////////////////////////////////////////////
// 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) {
@@ -38,18 +40,14 @@ void NativeViewHostAura::NativeViewDetaching(bool 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);
+ RemoveClippingWindow();
}
}
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());
+ AddClippingWindow();
if (host_->IsDrawn())
host_->native_view()->Show();
else
@@ -60,15 +58,18 @@ void NativeViewHostAura::AddedToWidget() {
void NativeViewHostAura::RemovedFromWidget() {
if (host_->native_view()) {
host_->native_view()->Hide();
- if (host_->native_view()->parent())
- host_->native_view()->parent()->RemoveChild(host_->native_view());
+ RemoveClippingWindow();
}
}
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 +77,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 +125,76 @@ 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() {
+ RemoveClippingWindow();
+ clipping_window_ = new aura::Window(NULL);
+ clipping_window_->SetTransparent(true);
+ clipping_window_->Init(ui::LAYER_NOT_DRAWN);
+ clipping_window_->layer()->set_name("NativeViewHostAuraClip");
+ clipping_window_->layer()->SetMasksToBounds(false);
+
+ gfx::Rect bounds = host_->native_view()->bounds();
+ orig_bounds_ = bounds;
+ clipping_window_->SetBounds(bounds);
+ bounds.set_origin(gfx::Point(0, 0));
+ host_->native_view()->SetBounds(bounds);
+
+ clipping_window_->AddChild(host_->native_view());
+ Widget::ReparentNativeView(clipping_window_,
+ host_->GetWidget()->GetNativeView());
+ clipping_window_->Show();
+}
+
+void NativeViewHostAura::RemoveClippingWindow() {
+ if (clipping_window_) {
+ if (host_->native_view()->parent() == clipping_window_) {
+ host_->native_view()->SetBounds(clipping_window_->bounds());
+ if (clipping_window_->parent()) {
+ Widget::ReparentNativeView(host_->native_view(), NULL);
+ } else {
+ clipping_window_->RemoveChild(host_->native_view());
+ }
+ }
+
+ if (clipping_window_->parent())
+ clipping_window_->parent()->RemoveChild(clipping_window_);
+
+ delete clipping_window_;
+ clipping_window_ = NULL;
+ }
+}
+
+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);
xiyuan 2013/10/22 20:12:46 I missed this on the orignal review. We need to ch
rharrison 2013/10/22 20:34:41 I have integrated your patch and tested that it wo
+
+ native_view_bounds.set_origin(native_view_origin);
+ host_->native_view()->SetBounds(native_view_bounds);
+ } else {
+ if (clipping_window_) {
+ clip_rect_ = orig_bounds_;
+ clipping_window_->SetBounds(orig_bounds_);
+ host_->native_view()->SetBounds(gfx::Rect(orig_bounds_.size()));
+ } else {
+ host_->native_view()->SetBounds(gfx::Rect(orig_bounds_));
+ }
+ }
+}
+
} // namespace views

Powered by Google App Engine
This is Rietveld 408576698