Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1748)

Unified Diff: ui/gfx/scoped_ns_graphics_context_save_gstate_mac.mm

Issue 10837158: mac: Delete more 10.5-only code (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: mark Created 8 years, 4 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
« no previous file with comments | « skia/ext/skia_utils_mac.mm ('k') | ui/gfx/video_decode_acceleration_support_mac_unittest.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/scoped_ns_graphics_context_save_gstate_mac.mm
diff --git a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.mm b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.mm
index 9dca12018c2916ebe99518613f51f52e9c446706..6b19d8cf85efad684243fb2f2cb246446a2e2c2d 100644
--- a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.mm
+++ b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.mm
@@ -7,7 +7,6 @@
#import <AppKit/AppKit.h>
#include "base/logging.h"
-#include "base/mac/mac_util.h"
namespace gfx {
@@ -18,16 +17,6 @@ ScopedNSGraphicsContextSaveGState::ScopedNSGraphicsContextSaveGState()
ScopedNSGraphicsContextSaveGState::~ScopedNSGraphicsContextSaveGState() {
[NSGraphicsContext restoreGraphicsState];
- if (!context_ && base::mac::IsOSLeopardOrEarlier()) {
- // On 10.5 and earlier, there is a bug. If the current graphics context was
- // nil when +[NSGraphicsContext saveGraphicsState] was called, then calling
- // +[NSGraphicsContext restoreGraphicsState] will not restore a nil current
- // context, but will leave the current context in place. Because allowing
- // that stale context (which will be deallocated soon) to remain current
- // will only lead to heartache and pain, the current context must be
- // manually nilled out.
- [NSGraphicsContext setCurrentContext:nil];
- }
DCHECK_EQ(context_, [NSGraphicsContext currentContext]);
}
« no previous file with comments | « skia/ext/skia_utils_mac.mm ('k') | ui/gfx/video_decode_acceleration_support_mac_unittest.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698