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]); |
} |