Revert of Remove NativeThemeWin::PaintIndirect

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,
+                   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,
+                     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,
                            int ts,
                            SIZE* size) const;
 
   HRESULT PaintButton(HDC hdc,
                       State state,
                       const ButtonExtraParams& extra,
                       int part_id,
                       int state_id,
                       RECT* rect) const;
 
+  HRESULT PaintMenuSeparator(HDC hdc,
+                             const gfx::Rect& rect) const;
+
+  HRESULT PaintMenuGutter(HDC hdc, const gfx::Rect& rect) const;
+
   // |arrow_direction| determines whether the arrow is pointing to the left or
   // to the right. In RTL locales, sub-menus open from right to left and
   // therefore the menu arrow should point to the left and not to the right.
   HRESULT PaintMenuArrow(HDC hdc,
                          State state,
                          const gfx::Rect& rect,
                          const MenuArrowExtraParams& extra) const;
 
+  HRESULT PaintMenuBackground(HDC hdc, const gfx::Rect& rect) const;
+
   HRESULT PaintMenuCheck(HDC hdc,
                          State state,
                          const gfx::Rect& rect,
                          const MenuCheckExtraParams& extra) const;
 
   HRESULT PaintMenuCheckBackground(HDC hdc,
                                    State state,
                                    const gfx::Rect& rect) const;
 
+  HRESULT PaintMenuItemBackground(HDC hdc,
+                                  State state,
+                                  const gfx::Rect& rect,
+                                  const MenuItemExtraParams& extra) const;
+
   HRESULT PaintPushButton(HDC hdc,
                           Part part,
                           State state,
                           const gfx::Rect& rect,
                           const ButtonExtraParams& extra) const;
 
   HRESULT PaintRadioButton(HDC hdc,
                            Part part,
                            State state,
                            const gfx::Rect& rect,
@@ skipping 166 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_