chrome/browser/ui/cocoa/extensions/browser_action_button.mm - Issue 6904026: Add and use gfx::ScopedNSGraphicsContextState (ui/gfx/scoped_ns_graphics_context_state_mac.h).

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/cocoa/extensions/browser_action_button.mm

Issue 6904026: Add and use gfx::ScopedNSGraphicsContextState (ui/gfx/scoped_ns_graphics_context_state_mac.h). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 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/renderer_host/render_widget_host_view_mac.mm ('K') | « chrome/browser/ui/cocoa/download/download_item_cell.mm ('k') | chrome/browser/ui/cocoa/find_bar/find_bar_view.mm » ('j') | ui/gfx/scoped_ns_graphics_context_state_mac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/cocoa/extensions/browser_action_button.mm

diff --git a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm

index aaaefb96f451930ab67570fdec3d0e1dd662f98f..78bdae2837057578709017cb3cb169cc78120820 100644

--- a/chrome/browser/ui/cocoa/extensions/browser_action_button.mm

+++ b/chrome/browser/ui/cocoa/extensions/browser_action_button.mm

@@ -23,6 +23,7 @@

#import "third_party/GTM/AppKit/GTMNSAnimation+Duration.h"

#include "ui/gfx/canvas_skia_paint.h"

#include "ui/gfx/rect.h"

+#include "ui/gfx/scoped_ns_graphics_context_state_mac.h"

#include "ui/gfx/size.h"

NSString* const kBrowserActionButtonUpdatedNotification =

@@ -309,11 +310,10 @@ class ExtensionImageTrackerBridge : public NotificationObserver,

}

- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView {

- [NSGraphicsContext saveGraphicsState];

+ gfx::ScopedNSGraphicsContextState scopedGState;

[super drawInteriorWithFrame:cellFrame inView:controlView];

cellFrame.origin.y += kBrowserActionBadgeOriginYOffset;

[self drawBadgeWithinFrame:cellFrame];

- [NSGraphicsContext restoreGraphicsState];

}

@end