views: Access the Canvas through recorders not through PaintContext.

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"
 #include "chrome/browser/ui/omnibox/omnibox_view.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_result_view.h"
 #include "ui/base/theme_provider.h"
+#include "ui/compositor/clip_transform_recorder.h"
 #include "ui/compositor/paint_context.h"
+#include "ui/compositor/paint_recorder.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/path.h"
 #include "ui/resources/grit/ui_resources.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/view_targeter.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
 namespace {
@@ skipping 387 matching lines @@
   // Bottom border.
   canvas->TileImageInt(*bottom_shadow_, 0, height() - bottom_shadow_->height(),
                        width(), bottom_shadow_->height());
 }
 
 void OmniboxPopupContentsView::PaintChildren(const ui::PaintContext& context) {
   gfx::Rect contents_bounds = GetContentsBounds();
   contents_bounds.Inset(0, views::NonClientFrameView::kClientEdgeThickness, 0,
                         bottom_shadow_->height() - kBorderInterior);
 
-  gfx::Canvas* canvas = context.canvas();
-  canvas->Save();
-  canvas->ClipRect(contents_bounds);
-  canvas->DrawColor(result_view_at(0)->GetColor(OmniboxResultView::NORMAL,
-                                                OmniboxResultView::BACKGROUND));
+  ui::ClipTransformRecorder clip_transform_recorder(context);
+  clip_transform_recorder.ClipRect(contents_bounds);
+  {
+    ui::PaintRecorder recorder(context);

[Peter Kasting, 2015/04/06 19:24:36]

How come this needs to be scoped?  It makes it look as if we'll reset the canvas
draw color back to what it was before at the end of the scope.  I assume reality
is different somehow?

[danakj, 2015/04/06 19:29:07]

Right, PaintRecorder doesn't SaveRestore like the clip/transform one.

This is scoped because Painting can not be nested. The things inside this scope
are going to end up in a single DrawingDisplayItem in the DisplayItemList.

+    SkColor background_color = result_view_at(0)->GetColor(
+        OmniboxResultView::NORMAL, OmniboxResultView::BACKGROUND);
+    recorder.canvas()->DrawColor(background_color);
+  }
   View::PaintChildren(context);
-  canvas->Restore();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // OmniboxPopupContentsView, private:
 
 views::View* OmniboxPopupContentsView::TargetForRect(views::View* root,
                                                      const gfx::Rect& rect) {
   CHECK_EQ(root, this);
   return this;
 }
@@ skipping 39 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)));
 }