diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 01:12:51 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-02-07 01:12:51 +0000 |
| commit | 321bc6158b67c6dd7cc7dd69727b76510bcd6016 (patch) | |
| tree | d65e1bd33a6f2519a833c7abfd5e5129b255d342 /ui/views/widget | |
| parent | 6cd1403445088bdb2fa63c3eb79faa2c7fcfd221 (diff) | |
| download | chromium_src-321bc6158b67c6dd7cc7dd69727b76510bcd6016.zip chromium_src-321bc6158b67c6dd7cc7dd69727b76510bcd6016.tar.gz chromium_src-321bc6158b67c6dd7cc7dd69727b76510bcd6016.tar.bz2 | |
Delete region in NWA::SetShape which is ignored.
BUG=none
TEST=valgrind bot doesn't report this error.
Review URL: https://chromiumcodereview.appspot.com/9325081
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120670 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/widget')
| -rw-r--r-- | ui/views/widget/native_widget_aura.cc | 7 | ||||
| -rw-r--r-- | ui/views/widget/native_widget_aura_unittest.cc | 2 |
2 files changed, 4 insertions, 5 deletions
diff --git a/ui/views/widget/native_widget_aura.cc b/ui/views/widget/native_widget_aura.cc index 6641b87..5e66c6c 100644 --- a/ui/views/widget/native_widget_aura.cc +++ b/ui/views/widget/native_widget_aura.cc @@ -6,6 +6,7 @@ #include "base/bind.h" #include "base/string_util.h" +#include "third_party/skia/include/core/SkRegion.h" #include "ui/aura/client/activation_client.h" #include "ui/aura/client/aura_constants.h" #include "ui/aura/client/drag_drop_client.h" @@ -413,7 +414,8 @@ void NativeWidgetAura::StackAtTop() { } void NativeWidgetAura::SetShape(gfx::NativeRegion region) { - // No need for this. + // No need for this. Just delete and ignore. + delete region; } void NativeWidgetAura::Close() { @@ -727,9 +729,6 @@ void NativeWidgetAura::OnWindowDestroying() { // If the aura::Window is destroyed, we can no longer show tooltips. tooltip_manager_.reset(); - - // Cleanup properties associated with the window here. - delete GetRestoreBounds(window_); } void NativeWidgetAura::OnWindowDestroyed() { diff --git a/ui/views/widget/native_widget_aura_unittest.cc b/ui/views/widget/native_widget_aura_unittest.cc index 2b9f874..e7ddf31 100644 --- a/ui/views/widget/native_widget_aura_unittest.cc +++ b/ui/views/widget/native_widget_aura_unittest.cc @@ -153,7 +153,7 @@ TEST_F(NativeWidgetAuraTest, GetClientAreaScreenBounds) { Widget::InitParams params(Widget::InitParams::TYPE_WINDOW); params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET; params.bounds.SetRect(10, 20, 300, 400); - scoped_ptr<Widget> widget(new Widget()); + Widget* widget = new Widget(); widget->Init(params); // For Aura, client area bounds match window bounds. |