summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 19:23:20 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-06 19:23:20 +0000
commit89587d8e7a6ce9032160f26877dcf41b322563be (patch)
tree54a2c7d67b9f82195d0200821c2694fa8e52e3a8 /views
parenta5dd7b289ac0fe502be3e4d29c0932a891d98abc (diff)
downloadchromium_src-89587d8e7a6ce9032160f26877dcf41b322563be.zip
chromium_src-89587d8e7a6ce9032160f26877dcf41b322563be.tar.gz
chromium_src-89587d8e7a6ce9032160f26877dcf41b322563be.tar.bz2
Fixes another gray rect. This problem occurred because NativeViewHost
was not correctly resetting state when the child was switched. In particular it wouldn't remove the clip when switching, which meant that if we switched back to an hwnd we had installed a clip we wouldn't reset the clip when we should have. BUG=57573 TEST=see bug Review URL: http://codereview.chromium.org/3605010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@61688 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/controls/native/native_view_host_win.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/views/controls/native/native_view_host_win.cc b/views/controls/native/native_view_host_win.cc
index 87c6c3b..737b6f9 100644
--- a/views/controls/native/native_view_host_win.cc
+++ b/views/controls/native/native_view_host_win.cc
@@ -49,6 +49,8 @@ void NativeViewHostWin::NativeViewAttached() {
}
void NativeViewHostWin::NativeViewDetaching(bool destroyed) {
+ if (!destroyed && installed_clip_)
+ UninstallClip();
installed_clip_ = false;
// Notify children that parent is removed
std::vector<RootView*> root_views;