summaryrefslogtreecommitdiffstats
path: root/views
diff options
context:
space:
mode:
authorpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 13:32:18 +0000
committerpkotwicz@chromium.org <pkotwicz@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-09-28 13:32:18 +0000
commit236015840b743e444523db6335f167c0dd2adc30 (patch)
tree19ef2a81539303ffb2b3412c79725f653bcc8f84 /views
parentedf2158dd82911f9d5057d33b06c9c21c18b33db (diff)
downloadchromium_src-236015840b743e444523db6335f167c0dd2adc30.zip
chromium_src-236015840b743e444523db6335f167c0dd2adc30.tar.gz
chromium_src-236015840b743e444523db6335f167c0dd2adc30.tar.bz2
Fixes painting issue with bookmarks bar
When the bookmarks bar was showing, opening a dialog which paints on top of the bookmark bar in touch_ui and dismissing it would leave ghosts where the dialog used to be. The reason is that the root view has a layer. It would paint the entire view tree into the root view including content which is contained by child layers BUG=none TEST=none Review URL: http://codereview.chromium.org/8046019 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@103111 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
-rw-r--r--views/view.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/views/view.cc b/views/view.cc
index 510e37f..3aa4fbf 100644
--- a/views/view.cc
+++ b/views/view.cc
@@ -1076,7 +1076,8 @@ void View::NativeViewHierarchyChanged(bool attached,
void View::PaintChildren(gfx::Canvas* canvas) {
for (int i = 0, count = child_count(); i < count; ++i)
- child_at(i)->Paint(canvas);
+ if (!child_at(i)->layer())
+ child_at(i)->Paint(canvas);
}
void View::OnPaint(gfx::Canvas* canvas) {