omnibox: Don't paint children from inside OnPaint().

chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
 
 #include <algorithm>
 
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/themes/theme_properties.h"
@@ skipping 352 matching lines @@
       break;
     default:
       return;
   }
   event->SetHandled();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, protected:
 
-void OmniboxPopupContentsView::PaintResultViews(gfx::Canvas* canvas) {
-  canvas->DrawColor(result_view_at(0)->GetColor(
-      OmniboxResultView::NORMAL, OmniboxResultView::BACKGROUND));
-  View::PaintChildren(canvas, views::CullSet());
-}
-
 int OmniboxPopupContentsView::CalculatePopupHeight() {
   DCHECK_GE(static_cast<size_t>(child_count()), model_->result().size());
   int popup_height = 0;
   for (size_t i = model_->result().ShouldHideTopMatch() ? 1 : 0;
        i < model_->result().size(); ++i)
     popup_height += child_at(i)->GetPreferredSize().height();
 
   // Add enough space on the top and bottom so it looks like there is the same
   // amount of space between the text and the popup border as there is in the
   // interior between each row of text.
@@ skipping 13 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, views::View overrides, private:
 
 const char* OmniboxPopupContentsView::GetClassName() const {
   return "OmniboxPopupContentsView";
 }
 
 void OmniboxPopupContentsView::OnPaint(gfx::Canvas* canvas) {
-  gfx::Rect contents_bounds = GetContentsBounds();
-  contents_bounds.set_height(
-      contents_bounds.height() - bottom_shadow_->height() + kBorderInterior);
-
-  gfx::Path path;
-  MakeContentsPath(&path, contents_bounds);
-  canvas->Save();
-  canvas->sk_canvas()->clipPath(path,
-                                SkRegion::kIntersect_Op,
-                                true /* doAntialias */);
-  PaintResultViews(canvas);
-  canvas->Restore();
-
   // Top border.
   canvas->FillRect(
       gfx::Rect(0, 0, width(), views::NonClientFrameView::kClientEdgeThickness),
       ThemeProperties::GetDefaultColor(
           ThemeProperties::COLOR_TOOLBAR_SEPARATOR));
 
   // Bottom border.
   canvas->TileImageInt(*bottom_shadow_, 0, height() - bottom_shadow_->height(),
                        width(), bottom_shadow_->height());
 }
 
 void OmniboxPopupContentsView::PaintChildren(gfx::Canvas* canvas,
                                              const views::CullSet& cull_set) {
-  // We paint our children inside OnPaint().
+  gfx::Rect contents_bounds = GetContentsBounds();
+  contents_bounds.Inset(0, views::NonClientFrameView::kClientEdgeThickness, 0,
+                        bottom_shadow_->height() - kBorderInterior);
+
+  canvas->Save();
+  canvas->sk_canvas()->clipRect(gfx::RectToSkRect(contents_bounds),
+                                SkRegion::kIntersect_Op,
+                                true /* doAntialias */);
+  canvas->DrawColor(result_view_at(0)->GetColor(OmniboxResultView::NORMAL,
+                                                OmniboxResultView::BACKGROUND));
+  View::PaintChildren(canvas, cull_set);
+  canvas->Restore();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, private:
 
 views::View* OmniboxPopupContentsView::TargetForRect(views::View* root,
                                                      const gfx::Rect& rect) {
   CHECK_EQ(root, this);
   return this;
 }
 
 bool OmniboxPopupContentsView::HasMatchAt(size_t index) const {
   return index < model_->result().size();
 }
 
 const AutocompleteMatch& OmniboxPopupContentsView::GetMatchAtIndex(
     size_t index) const {
   return model_->result().match_at(index);
 }
 
-void OmniboxPopupContentsView::MakeContentsPath(
-    gfx::Path* path,
-    const gfx::Rect& bounding_rect) {
-  SkRect rect;
-  rect.set(SkIntToScalar(bounding_rect.x()),
-           SkIntToScalar(bounding_rect.y()),
-           SkIntToScalar(bounding_rect.right()),
-           SkIntToScalar(bounding_rect.bottom()));
-  path->addRect(rect);
-}
-
 size_t OmniboxPopupContentsView::GetIndexForPoint(
     const gfx::Point& point) {
   if (!HitTestPoint(point))
     return OmniboxPopupModel::kNoMatch;
 
   int nb_match = model_->result().size();
   DCHECK(nb_match <= child_count());
   for (int i = 0; i < nb_match; ++i) {
     views::View* child = child_at(i);
     gfx::Point point_in_child_coords(point);
@@ skipping 19 matching lines @@
   size_t index = GetIndexForPoint(event.location());
   if (!HasMatchAt(index))
     return;
   omnibox_view_->OpenMatch(model_->result().match_at(index), disposition,
                            GURL(), base::string16(), index);
 }
 
 OmniboxResultView* OmniboxPopupContentsView::result_view_at(size_t i) {
   return static_cast<OmniboxResultView*>(child_at(static_cast<int>(i)));
 }