Always call the class methods to save/restore contexts.

If the current context was ever nil, sending a "restore" message would be a no-op and would likely leave an out-of-scope context as current.

BUG=90140
TEST=repeatedly select items in an open file dialog in column mode; no crash

Review URL: http://codereview.chromium.org/7572031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95611 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 7 deletions

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 f3992ea..6b19d8c 100644
--- a/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.mm
+++ b/ui/gfx/scoped_ns_graphics_context_save_gstate_mac.mm
@@ -4,19 +4,20 @@
 
 #include "ui/gfx/scoped_ns_graphics_context_save_gstate_mac.h"
 
-#include <AppKit/AppKit.h>
+#import <AppKit/AppKit.h>
+
+#include "base/logging.h"
 
 namespace gfx {
 
-ScopedNSGraphicsContextSaveGState::ScopedNSGraphicsContextSaveGState(
-    NSGraphicsContext* context) : context_([context retain]) {
-  if (!context_)
-    context_.reset([[NSGraphicsContext currentContext] retain]);
-  [context_ saveGraphicsState];
+ScopedNSGraphicsContextSaveGState::ScopedNSGraphicsContextSaveGState()
+    : context_([NSGraphicsContext currentContext]) {
+  [NSGraphicsContext saveGraphicsState];
 }
 
 ScopedNSGraphicsContextSaveGState::~ScopedNSGraphicsContextSaveGState() {
-  [context_ restoreGraphicsState];
+  [NSGraphicsContext restoreGraphicsState];
+  DCHECK_EQ(context_, [NSGraphicsContext currentContext]);
 }
 
 }  // namespace gfx