Reverting 7317.

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

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

1 files changed, 8 insertions, 8 deletions

diff --git a/skia/ext/bitmap_platform_device_win.h b/skia/ext/bitmap_platform_device_win.h
index f6e456d..e3b63cb 100644
--- a/skia/ext/bitmap_platform_device_win.h
+++ b/skia/ext/bitmap_platform_device_win.h
@@ -5,6 +5,7 @@
 #ifndef SKIA_BITMAP_PLATFORM_DEVICE_WIN_H_
 #define SKIA_BITMAP_PLATFORM_DEVICE_WIN_H_
 
+#include "base/ref_counted.h"
 #include "skia/ext/platform_device_win.h"
 
 namespace skia {
@@ -33,10 +34,10 @@ class BitmapPlatformDeviceWin : public PlatformDeviceWin {
   // If shared_section is non-null, then it must be a handle to a file-mapping
   // object returned by CreateFileMapping.  See CreateDIBSection for details.
   static BitmapPlatformDeviceWin* create(HDC screen_dc,
-                                         int width,
-                                         int height,
-                                         bool is_opaque,
-                                         HANDLE shared_section);
+                                int width,
+                                int height,
+                                bool is_opaque,
+                                HANDLE shared_section);
 
   // Copy constructor. When copied, devices duplicate their internal data, so
   // stay linked. This is because their implementation is very heavyweight
@@ -87,7 +88,7 @@ class BitmapPlatformDeviceWin : public PlatformDeviceWin {
   // bitmaps used by the base device class are already refcounted and copyable.
   class BitmapPlatformDeviceWinData;
 
-  // Private constructor. The data should already be ref'ed for us.
+  // Private constructor.
   BitmapPlatformDeviceWin(BitmapPlatformDeviceWinData* data,
                           const SkBitmap& bitmap);
 
@@ -100,9 +101,8 @@ class BitmapPlatformDeviceWin : public PlatformDeviceWin {
                      int width,
                      int height);
 
-  // Data associated with this device, guaranteed non-null. We hold a reference
-  // to this object.
-  BitmapPlatformDeviceWinData* data_;
+  // Data associated with this device, guaranteed non-null.
+  scoped_refptr<BitmapPlatformDeviceWinData> data_;
 };
 
 }  // namespace skia