Revert 121840 - Make scoped dc objects smarter

ui/gfx/native_theme_win.cc

 // Copyright (c) 2012 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.
 
 #include "ui/gfx/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 617 matching lines @@
                          NULL);
     } else {
       // There is no way to tell the uxtheme API to draw a left pointing arrow;
       // it doesn't have a flag equivalent to DFCS_MENUARROWRIGHT.  But they
       // are needed for RTL locales on Vista.  So use a memory DC and mirror
       // the region with GDI's StretchBlt.
       Rect r(rect);
       base::win::ScopedCreateDC mem_dc(CreateCompatibleDC(hdc));
       base::win::ScopedBitmap mem_bitmap(CreateCompatibleBitmap(hdc, r.width(),
                                                                 r.height()));
-      base::win::ScopedSelectObject select_bitmap(mem_dc.get(), mem_bitmap);
+      base::win::ScopedSelectObject select_bitmap(mem_dc, mem_bitmap);
       // Copy and horizontally mirror the background from hdc into mem_dc. Use
       // a negative-width source rect, starting at the rightmost pixel.
-      StretchBlt(mem_dc.get(), 0, 0, r.width(), r.height(),
+      StretchBlt(mem_dc, 0, 0, r.width(), r.height(),
                  hdc, r.right()-1, r.y(), -r.width(), r.height(), SRCCOPY);
       // Draw the arrow.
       RECT theme_rect = {0, 0, r.width(), r.height()};
-      HRESULT result = draw_theme_(handle, mem_dc.get(), MENU_POPUPSUBMENU,
+      HRESULT result = draw_theme_(handle, mem_dc, MENU_POPUPSUBMENU,
                                    state_id, &theme_rect, NULL);
       // Copy and mirror the result back into mem_dc.
       StretchBlt(hdc, r.x(), r.y(), r.width(), r.height(),
-                 mem_dc.get(), r.width()-1, 0, -r.width(), r.height(), SRCCOPY);
+                 mem_dc, r.width()-1, 0, -r.width(), r.height(), SRCCOPY);
       return result;
     }
   }
 
   // For some reason, Windows uses the name DFCS_MENUARROWRIGHT to indicate a
   // left pointing arrow. This makes the following 'if' statement slightly
   // counterintuitive.
   UINT pfc_state;
   if (extra.pointing_right)
     pfc_state = DFCS_MENUARROW;
@@ skipping 1001 matching lines @@
   const int width = rect.width();
   const int height = rect.height();
 
   // DrawFrameControl for menu arrow/check wants a monochrome bitmap.
   base::win::ScopedBitmap mask_bitmap(CreateBitmap(width, height, 1, 1, NULL));
 
   if (mask_bitmap == NULL)
     return E_OUTOFMEMORY;
 
   base::win::ScopedCreateDC bitmap_dc(CreateCompatibleDC(NULL));
-  base::win::ScopedSelectObject select_bitmap(bitmap_dc.get(), mask_bitmap);
+  base::win::ScopedSelectObject select_bitmap(bitmap_dc, mask_bitmap);
   RECT local_rect = { 0, 0, width, height };
-  DrawFrameControl(bitmap_dc.get(), &local_rect, type, state);
+  DrawFrameControl(bitmap_dc, &local_rect, type, state);
 
   // We're going to use BitBlt with a b&w mask. This results in using the dest
   // dc's text color for the black bits in the mask, and the dest dc's
   // background color for the white bits in the mask. DrawFrameControl draws the
   // check in black, and the background in white.
   int bg_color_key;
   int text_color_key;
   switch (control_state) {
     case gfx::NativeTheme::kHovered:
       bg_color_key = COLOR_HIGHLIGHT;
       text_color_key = COLOR_HIGHLIGHTTEXT;
       break;
     case gfx::NativeTheme::kNormal:
       bg_color_key = COLOR_MENU;
       text_color_key = COLOR_MENUTEXT;
       break;
     case gfx::NativeTheme::kDisabled:
       bg_color_key = is_selected ? COLOR_HIGHLIGHT : COLOR_MENU;
       text_color_key = COLOR_GRAYTEXT;
       break;
     default:
       NOTREACHED();
       bg_color_key = COLOR_MENU;
       text_color_key = COLOR_MENUTEXT;
       break;
   }
   COLORREF old_bg_color = SetBkColor(hdc, GetSysColor(bg_color_key));
   COLORREF old_text_color = SetTextColor(hdc, GetSysColor(text_color_key));
-  BitBlt(hdc,
-         rect.x(), rect.y(), width, height,
-         bitmap_dc.get(),
-         0, 0,
-         SRCCOPY);
+  BitBlt(hdc, rect.x(), rect.y(), width, height, bitmap_dc, 0, 0, SRCCOPY);
   SetBkColor(hdc, old_bg_color);
   SetTextColor(hdc, old_text_color);
 
   return S_OK;
 }
 
 HANDLE NativeThemeWin::GetThemeHandle(ThemeName theme_name) const {
   if (!open_theme_ || theme_name < 0 || theme_name >= LAST)
     return 0;
 
@@ skipping 40 matching lines @@
     handle = open_theme_(NULL, L"Spin");
     break;
   default:
     NOTREACHED();
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace gfx