Consolidate Windows bitmap and DC code

ui/native_theme/native_theme_win.h

 // 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.
 
 #ifndef UI_NATIVE_THEME_NATIVE_THEME_WIN_H_
 #define UI_NATIVE_THEME_NATIVE_THEME_WIN_H_
 
 // A wrapper class for working with custom XP/Vista themes provided in
 // uxtheme.dll.  This is a singleton class that can be grabbed using
 // NativeThemeWin::instance().
@@ skipping 112 matching lines @@
   void OnSysColorChange() override;
 
   // Update the locally cached set of system colors.
   void UpdateSystemColors();
 
   // Painting functions that paint to SkCanvas.
   void PaintMenuSeparator(SkCanvas* canvas, const gfx::Rect& rect) const;
   void PaintMenuGutter(SkCanvas* canvas, const gfx::Rect& rect) const;
   void PaintMenuBackground(SkCanvas* canvas, const gfx::Rect& rect) const;
 
-  // Paint directly to canvas' HDC.
-  void PaintDirect(SkCanvas* canvas,
+  // Paint directly to HDC.
+  void PaintDirect(HDC hdc,
                    Part part,
                    State state,
                    const gfx::Rect& rect,
                    const ExtraParams& extra) const;
 
   // Create a temporary HDC, paint to that, clean up the alpha values in the
   // temporary HDC, and then blit the result to canvas.  This is to work around
   // the fact that Windows XP and some classic themes give bogus alpha values.
-  void PaintIndirect(SkCanvas* canvas,
+  void PaintIndirect(HDC hdc,
                      Part part,
                      State state,
                      const gfx::Rect& rect,
                      const ExtraParams& extra) const;
 
   HRESULT GetThemePartSize(ThemeName themeName,
                            HDC hdc,
                            int part_id,
                            int state_id,
                            RECT* rect,
@@ skipping 70 matching lines @@
   HRESULT PaintScrollbarThumb(HDC hdc,
                               Part part,
                               State state,
                               const gfx::Rect& rect,
                               const ScrollbarThumbExtraParams& extra) const;
 
   // This method is deprecated and will be removed in the near future.
   // Paints a scrollbar track section.  |align_rect| is only used in classic
   // mode, and makes sure the checkerboard pattern in |target_rect| is aligned
   // with one presumed to be in |align_rect|.
-  HRESULT PaintScrollbarTrack(SkCanvas* canvas,
-                              HDC hdc,
+  HRESULT PaintScrollbarTrack(HDC hdc,
                               Part part,
                               State state,
                               const gfx::Rect& rect,
                               const ScrollbarTrackExtraParams& extra) const;
 
   HRESULT PaintSpinButton(HDC hdc,
                           Part part,
                           State state,
                           const gfx::Rect& rect,
                           const InnerSpinButtonExtraParams& extra) const;
 
-  HRESULT PaintTrackbar(SkCanvas* canvas,
-                        HDC hdc,
+  HRESULT PaintTrackbar(HDC hdc,
                         Part part,
                         State state,
                         const gfx::Rect& rect,
                         const TrackbarExtraParams& extra) const;
 
   HRESULT PaintProgressBar(HDC hdc,
                            const gfx::Rect& rect,
                            const ProgressBarExtraParams& extra) const;
 
   HRESULT PaintWindowResizeGripper(HDC hdc, const gfx::Rect& rect) const;
@@ skipping 110 matching lines @@
 
   // Is |is_using_high_contrast_| valid?
   mutable bool is_using_high_contrast_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeThemeWin);
 };
 
 }  // namespace ui
 
 #endif  // UI_NATIVE_THEME_NATIVE_THEME_WIN_H_