chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc - Issue 1054783003: views: Access the Canvas through recorders not through PaintContext.

Unified Diff: chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

Issue 1054783003: views: Access the Canvas through recorders not through PaintContext. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 8 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

« chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc ('K') | « chrome/browser/ui/views/location_bar/page_action_image_view.cc ('k') | ui/compositor/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc b/chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc

index c05785a2d0beb4a5c9cb2b6384bc0dedab434cb6..3aa37e2baa386a8453eceb3755a4b951f27d4b45 100644

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

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

@@ -12,7 +12,9 @@

#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"

@@ -420,13 +422,15 @@ void OmniboxPopupContentsView::PaintChildren(const ui::PaintContext& context) {

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 loo

danakj 2015/04/06 19:29:07 Right, PaintRecorder doesn't SaveRestore like the

+ SkColor background_color = result_view_at(0)->GetColor(

+ OmniboxResultView::NORMAL, OmniboxResultView::BACKGROUND);

+ recorder.canvas()->DrawColor(background_color);

+ }

View::PaintChildren(context);

- canvas->Restore();

}

////////////////////////////////////////////////////////////////////////////////