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

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/location_bar/page_action_image_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/location_bar_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc » ('j') | chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/location_bar/page_action_image_view.cc

diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc

index 92f29c2c5d78973d29d2b53338de4daaad6090ab..266a521b46bdcf91df6a2f89a734290b12fa819b 100644

--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc

+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc

@@ -14,6 +14,7 @@

#include "extensions/browser/extension_registry.h"

#include "ui/accessibility/ax_view_state.h"

#include "ui/compositor/paint_context.h"

+#include "ui/compositor/paint_recorder.h"

#include "ui/events/event.h"

#include "ui/gfx/canvas.h"

#include "ui/gfx/image/image.h"

@@ -112,9 +113,9 @@ void PageActionImageView::PaintChildren(const ui::PaintContext& context) {

View::PaintChildren(context);

int tab_id = SessionTabHelper::IdForTab(GetCurrentWebContents());

if (tab_id >= 0) {

- gfx::Canvas* canvas = context.canvas();

- view_controller_->extension_action()->PaintBadge(

- canvas, GetLocalBounds(), tab_id);

+ ui::PaintRecorder recorder(context);

+ view_controller_->extension_action()->PaintBadge(recorder.canvas(),

+ GetLocalBounds(), tab_id);

}