Move more web widgets painting from webkit to chrome.

gfx/native_theme_linux.h

 // 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.
 
 #ifndef GFX_NATIVE_THEME_LINUX_H_
 #define GFX_NATIVE_THEME_LINUX_H_
 
 #include "base/basictypes.h"
 #include "skia/ext/platform_canvas.h"
 
@@ skipping 10 matching lines @@
  public:
   // The part to be painted / sized.
   enum Part {
     kScrollbarDownArrow,
     kScrollbarLeftArrow,
     kScrollbarRightArrow,
     kScrollbarUpArrow,
     kScrollbarHorizontalThumb,
     kScrollbarVerticalThumb,
     kScrollbarHorizontalTrack,
-    kScrollbarVerticalTrack
+    kScrollbarVerticalTrack,
+    kCheckbox,
+    kRadio,
+    kPushButton,
+    kTextField,
+    kMenuList,
+    kSliderTrack,
+    kSliderThumb,
+    kInnerSpinButton,
+    kProgressBar,
   };
 
   // The state of the part.
   enum State {
     kDisabled,
     kHover,
     kNormal,
     kPressed,
   };
 
   // Extra data needed to draw scrollbar track correctly.
   struct ScrollbarTrackExtraParams {
     int track_x;
     int track_y;
     int track_width;
     int track_height;
   };
 
+  struct ButtonExtraParams {
+    bool checked;
+    bool indeterminate;  // Whether the button state is indeterminate.
+    bool is_default;  // Whether the button is default button.

[DaveMoore, 2011/01/19 17:04:13]

Nit: Line up the comments

[xiyuan, 2011/01/19 19:06:42]

Done.

+    SkColor background_color;
+  };
+
+  struct TextFieldExtraParams {
+    bool is_text_area;
+    bool is_listbox;
+    SkColor background_color;
+  };
+
+  struct MenuListExtraParams {
+    int arrow_x;
+    int arrow_y;
+    SkColor background_color;
+  };
+
+  struct SliderExtraParams {
+    bool vertical;
+    bool in_drag;
+  };
+
+  struct InnerSpinButtonExtraParams {
+    bool spin_up;
+    bool read_only;
+  };
+
+  struct ProgressBarExtraParams {
+    bool determinate;
+    int value_rect_x;
+    int value_rect_y;
+    int value_rect_width;
+    int value_rect_height;
+  };
+
   union ExtraParams {
     ScrollbarTrackExtraParams scrollbar_track;
+    ButtonExtraParams button;
+    MenuListExtraParams menu_list;
+    SliderExtraParams slider;
+    TextFieldExtraParams text_field;
+    InnerSpinButtonExtraParams inner_spin;
+    ProgressBarExtraParams progress_bar;
   };
 
   // Gets our singleton instance.
   static NativeThemeLinux* instance();
 
   // Return the size of the part.
   virtual gfx::Size GetSize(Part part) const;
   // Paint the part to the canvas.
   virtual void Paint(skia::PlatformCanvas* canvas,
                      Part part,
                      State state,
                      const gfx::Rect& rect,
                      const ExtraParams& extra);
   // Supports theme specific colors.
   void SetScrollbarColors(unsigned inactive_color,
                           unsigned active_color,
                           unsigned track_color) const;
 
  protected:
   NativeThemeLinux();
   virtual ~NativeThemeLinux();
 
   // Draw the arrow.
   virtual void PaintArrowButton(

[DaveMoore, 2011/01/19 17:04:13]

Now that there are other types drawn in this file the methods for scrollbar
drawing should be more specific

GetPartSize()
PaintScrollbarTrack()
PaintScrollbarThumb()


PaintArrowButton() is used for both other controls so it's ok

[xiyuan, 2011/01/19 19:06:42]

Done.

       skia::PlatformCanvas* gc,
       const gfx::Rect& rect,
       Part direction,
       State state);
   // Paint the track. Done before the thumb so that it can contain alpha.
   virtual void PaintTrack(skia::PlatformCanvas* canvas,
                   Part part,

[DaveMoore, 2011/01/19 17:04:13]

Nit: The indenting of all the declarations is wrong (including the existing
ones). The subsequent args should line up with the first one.

[xiyuan, 2011/01/19 19:06:42]

Done. I am using the 4-space indent since there are long args that could not fit
in 80 chars if align with first arg.

                   State state,
                   const ScrollbarTrackExtraParams& extra_params,
                   const gfx::Rect& rect);
   // Draw the thumb over the track.
   virtual void PaintThumb(skia::PlatformCanvas* canvas,
                   Part part,
                   State state,
                   const gfx::Rect& rect);
+  // Draw the checkbox.
+  virtual void PaintCheckbox(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const ButtonExtraParams& button);
+  // Draw the radio.
+  virtual void PaintRadio(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const ButtonExtraParams& button);
+  // Draw the push button.
+  virtual void PaintButton(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const ButtonExtraParams& button);
+  // Draw the text field.
+  virtual void PaintTextField(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const TextFieldExtraParams& text);
+  // Draw the menu list.
+  virtual void PaintMenuList(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const MenuListExtraParams& menu_list);
+  // Draw the slider track.
+  virtual void PaintSliderTrack(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const SliderExtraParams& slider);
+  // Draw the slider thumb.
+  virtual void PaintSliderThumb(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const SliderExtraParams& slider);
+  // Draw the inner spin button.
+  virtual void PaintInnerSpinButton(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const InnerSpinButtonExtraParams& spin_button);
+  // Draw the progress bar.
+  virtual void PaintProgressBar(skia::PlatformCanvas* canvas,
+                  State state,
+                  const gfx::Rect& rect,
+                  const ProgressBarExtraParams& progress_bar);
+
+ protected:
+  void DrawTiledImage(SkCanvas* canvas,
+                      const SkBitmap& bitmap,
+                      int src_x, int src_y,
+                      double tile_scale_x, double tile_scale_y,
+                      int dest_x, int dest_y, int w, int h) const;
+
+  SkColor SaturateAndBrighten(SkScalar* hsv,
+                              SkScalar saturate_amount,
+                              SkScalar brighten_amount) const;
 
  private:
   void DrawVertLine(SkCanvas* canvas,
                     int x,
                     int y1,
                     int y2,
                     const SkPaint& paint) const;
   void DrawHorizLine(SkCanvas* canvas,
                      int x1,
                      int x2,
                      int y,
                      const SkPaint& paint) const;
   void DrawBox(SkCanvas* canvas,
                const gfx::Rect& rect,
                const SkPaint& paint) const;
   SkScalar Clamp(SkScalar value,
                  SkScalar min,
                  SkScalar max) const;
-  SkColor SaturateAndBrighten(SkScalar* hsv,
-                              SkScalar saturate_amount,
-                              SkScalar brighten_amount) const;
   SkColor OutlineColor(SkScalar* hsv1, SkScalar* hsv2) const;
 
   static unsigned int scrollbar_width_;
   static unsigned int button_length_;
   static unsigned int thumb_inactive_color_;
   static unsigned int thumb_active_color_;
   static unsigned int track_color_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeThemeLinux);
 };
 
 }  // namespace gfx
 
 #endif  // GFX_NATIVE_THEME_LINUX_H_