1 Add ScopedGetDC and ScopedSelectObject

* To mark@, sky@
** base/win/scoped_hdc.h
** base/win/scoped_select_object.h

2 Fix leak in printing
* To kmadhusu@
** Play object creation command in metafile once
** Fix trivial leaks

3 Fix leak in SKIA
* To twiz@
** Fix font leak

BUG=98523
TEST=Manual on Win7

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

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

1 files changed, 29 insertions, 2 deletions

diff --git a/base/win/scoped_hdc.h b/base/win/scoped_hdc.h
index 73d369a7..8b316ca 100644
--- a/base/win/scoped_hdc.h
+++ b/base/win/scoped_hdc.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -9,12 +9,39 @@
 #include <windows.h>
 
 #include "base/basictypes.h"
+#include "base/logging.h"
 
 namespace base {
 namespace win {
 
 // Like ScopedHandle but for HDC.  Only use this on HDCs returned from
-// CreateCompatibleDC.  For an HDC returned by GetDC, use ReleaseDC instead.
+// GetDC.
+class ScopedGetDC {
+ public:
+  explicit ScopedGetDC(HWND hwnd)
+      : hwnd_(hwnd),
+        hdc_(GetDC(hwnd)) {
+    DCHECK(!hwnd_ || IsWindow(hwnd_));
+    DCHECK(hdc_);
+  }
+
+  ~ScopedGetDC() {
+    if (hdc_)
+      ReleaseDC(hwnd_, hdc_);
+  }
+
+  operator HDC() { return hdc_; }
+
+ private:
+  HWND hwnd_;
+  HDC hdc_;
+  DISALLOW_COPY_AND_ASSIGN(ScopedGetDC);
+};
+
+// Like ScopedHandle but for HDC.  Only use this on HDCs returned from
+// CreateCompatibleDC.
+// TODO(yosin) To eliminate confusion with ScopedGetDC, we should rename
+// ScopedHDC to ScopedCreateDC.
 class ScopedHDC {
  public:
   ScopedHDC() : hdc_(NULL) { }