diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 03:11:17 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-08-12 03:13:11 +0000 |
| commit | 9faa4c61fc4e52ff254eaa9fdff31f953732be67 (patch) | |
| tree | 481835d4c5fe128213cc71e9dd43fdb467afeb7f /ui/views | |
| parent | 7a3b60af073aec7b2558adf8ab092eb1a084d0d5 (diff) | |
| download | chromium_src-9faa4c61fc4e52ff254eaa9fdff31f953732be67.zip chromium_src-9faa4c61fc4e52ff254eaa9fdff31f953732be67.tar.gz chromium_src-9faa4c61fc4e52ff254eaa9fdff31f953732be67.tar.bz2 | |
Fix SetShape (SetAlphaShape) to allow Null regions (+ tests).
SetAlphaShape uses a filter to enforce min/max transparency on the window shape specified by the user. This transparency clamping is required by security to ship the SetShape feature.
We added the call to SetAlphaShape earlier, but we needed to temporarily remove it because of bugs with HiDPI devices and NULL shapes.
The issue with HiDPI devices has been fixed in crrev.com/394193003.
This cl fixes Null shape and re-adds the call to SetAlphaShape so that we can enable this feature on Stable.
BUG=324071
Review URL: https://codereview.chromium.org/456943004
Cr-Commit-Position: refs/heads/master@{#288889}
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@288889 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views')
3 files changed, 23 insertions, 5 deletions
diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc index 4bf96b1..56e485c 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11.cc @@ -496,10 +496,15 @@ gfx::Rect DesktopWindowTreeHostX11::GetWorkAreaBoundsInScreen() const { void DesktopWindowTreeHostX11::SetShape(gfx::NativeRegion native_region) { if (window_shape_) XDestroyRegion(window_shape_); - custom_window_shape_ = true; - window_shape_ = gfx::CreateRegionFromSkRegion(*native_region); + custom_window_shape_ = false; + window_shape_ = NULL; + + if (native_region) { + custom_window_shape_ = true; + window_shape_ = gfx::CreateRegionFromSkRegion(*native_region); + delete native_region; + } ResetWindowRegion(); - delete native_region; } void DesktopWindowTreeHostX11::Activate() { diff --git a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc index 8a66c6e..2e9188a 100644 --- a/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc +++ b/ui/views/widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc @@ -307,6 +307,17 @@ TEST_F(DesktopWindowTreeHostX11Test, Shape) { EXPECT_TRUE(ShapeRectContainsPoint(shape_rects, 15, 5)); EXPECT_TRUE(ShapeRectContainsPoint(shape_rects, 95, 15)); EXPECT_FALSE(ShapeRectContainsPoint(shape_rects, 105, 15)); + + // Setting the shape to NULL resets the shape back to the entire + // window bounds. + widget2->SetShape(NULL); + shape_rects = GetShapeRects(xid2); + ASSERT_FALSE(shape_rects.empty()); + EXPECT_TRUE(ShapeRectContainsPoint(shape_rects, 5, 5)); + EXPECT_TRUE(ShapeRectContainsPoint(shape_rects, 15, 5)); + EXPECT_TRUE(ShapeRectContainsPoint(shape_rects, 95, 15)); + EXPECT_TRUE(ShapeRectContainsPoint(shape_rects, 105, 15)); + EXPECT_FALSE(ShapeRectContainsPoint(shape_rects, 500, 500)); } // Test that the widget ignores changes in fullscreen state initiated by the diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index e57a4ff..d5b57587 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -438,8 +438,10 @@ void NativeWidgetAura::StackBelow(gfx::NativeView native_view) { } void NativeWidgetAura::SetShape(gfx::NativeRegion region) { - // No need for this. Just delete and ignore. - delete region; + if (window_) + window_->layer()->SetAlphaShape(make_scoped_ptr(region)); + else + delete region; } void NativeWidgetAura::Close() { |