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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 275183002: patch from issue 218843002 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebased Created 6 years, 7 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: chrome/browser/ui/views/location_bar/location_bar_view.cc
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 4da181d889df535c7f669b3f678f41240018d75f..8b679a0bf1ac91cc392be8af8bf927fa5918d4c8 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -1433,14 +1433,15 @@ void LocationBarView::OnPaint(gfx::Canvas* canvas) {
// inner shadow which should be drawn over the contents.
}
-void LocationBarView::PaintChildren(gfx::Canvas* canvas) {
+void LocationBarView::PaintChildren(gfx::Canvas* canvas,
+ const views::CullSet& cull_set) {
// Paint all the children except for the origin chip and the search button,
// which will be painted after the border.
for (int i = 0, count = child_count(); i < count; ++i) {
if (!child_at(i)->layer() &&
(child_at(i) != origin_chip_view_) &&
(child_at(i) != search_button_))
- child_at(i)->Paint(canvas);
+ child_at(i)->Paint(canvas, cull_set);
}
// For non-InstantExtendedAPI cases, if necessary, show focus rect. As we need
@@ -1459,8 +1460,8 @@ void LocationBarView::PaintChildren(gfx::Canvas* canvas) {
// The origin chip and the search button must be painted after the border so
// that the border shadow is not drawn over them.
- origin_chip_view_->Paint(canvas);
- search_button_->Paint(canvas);
+ origin_chip_view_->Paint(canvas, cull_set);
+ search_button_->Paint(canvas, cull_set);
}
////////////////////////////////////////////////////////////////////////////////

Powered by Google App Engine
This is Rietveld 408576698