Move more web widgets painting from webkit to chrome.

webkit/glue/webthemeengine_impl_linux.cc

Index: webkit/glue/webthemeengine_impl_linux.cc
diff --git a/webkit/glue/webthemeengine_impl_linux.cc b/webkit/glue/webthemeengine_impl_linux.cc
index 518166ec01a35e8b3a61a00d45693c743710c63e..61f51e7815dfd14e08abd79dca53cd9f4cc9c900 100644
--- a/webkit/glue/webthemeengine_impl_linux.cc
+++ b/webkit/glue/webthemeengine_impl_linux.cc
@@ -38,6 +38,24 @@ static gfx::NativeThemeLinux::Part NativeThemePart(
       return gfx::NativeThemeLinux::kScrollbarHorizontalTrack;
     case WebKit::WebThemeEngine::PartScrollbarVerticalTrack:
       return gfx::NativeThemeLinux::kScrollbarVerticalTrack;
+    case WebKit::WebThemeEngine::PartCheckbox:
+      return gfx::NativeThemeLinux::kCheckbox;
+    case WebKit::WebThemeEngine::PartRadio:
+      return gfx::NativeThemeLinux::kRadio;
+    case WebKit::WebThemeEngine::PartButton:
+      return gfx::NativeThemeLinux::kPushButton;
+    case WebKit::WebThemeEngine::PartTextField:
+      return gfx::NativeThemeLinux::kTextField;
+    case WebKit::WebThemeEngine::PartMenuList:
+      return gfx::NativeThemeLinux::kMenuList;
+    case WebKit::WebThemeEngine::PartSliderTrack:
+      return gfx::NativeThemeLinux::kSliderTrack;
+    case WebKit::WebThemeEngine::PartSliderThumb:
+      return gfx::NativeThemeLinux::kSliderThumb;
+    case WebKit::WebThemeEngine::PartInnerSpinButton:
+      return gfx::NativeThemeLinux::kInnerSpinButton;
+    case WebKit::WebThemeEngine::PartProgressBar:
+      return gfx::NativeThemeLinux::kProgressBar;
     default:
       return gfx::NativeThemeLinux::kScrollbarDownArrow;
   }
@@ -74,6 +92,51 @@ static void GetNativeThemeExtraParams(
         extra_params->scrollbarTrack.trackWidth;
     native_theme_extra_params->scrollbar_track.track_height =
         extra_params->scrollbarTrack.trackHeight;
+  } else if (part == WebKit::WebThemeEngine::PartCheckbox) {

[tony, 2011/01/18 22:39:19]

Should this be a switch instead of if/else if?

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

Done.

+    native_theme_extra_params->button.checked = extra_params->button.checked;
+    native_theme_extra_params->button.indeterminate =
+        extra_params->button.indeterminate;
+  } else if (part == WebKit::WebThemeEngine::PartRadio) {
+    native_theme_extra_params->button.checked = extra_params->button.checked;
+  } else if (part == WebKit::WebThemeEngine::PartButton) {
+    native_theme_extra_params->button.is_default =
+        extra_params->button.isDefault;
+    native_theme_extra_params->button.background_color =
+        extra_params->button.backgroundColor;
+  } else if (part == WebKit::WebThemeEngine::PartTextField) {
+    native_theme_extra_params->text_field.is_text_area =
+        extra_params->textField.isTextArea;
+    native_theme_extra_params->text_field.is_listbox =
+        extra_params->textField.isListbox;
+    native_theme_extra_params->text_field.background_color =
+        extra_params->textField.backgroundColor;
+  } else if (part == WebKit::WebThemeEngine::PartMenuList) {
+    native_theme_extra_params->menu_list.arrow_x =
+        extra_params->menuList.arrowX;
+    native_theme_extra_params->menu_list.arrow_y =
+        extra_params->menuList.arrowY;
+    native_theme_extra_params->menu_list.background_color =
+        extra_params->menuList.backgroundColor;
+  } else if (part == WebKit::WebThemeEngine::PartSliderTrack ||
+             part == WebKit::WebThemeEngine::PartSliderThumb) {
+    native_theme_extra_params->slider.vertical = extra_params->slider.vertical;
+    native_theme_extra_params->slider.in_drag = extra_params->slider.inDrag;
+  } else if (part == WebKit::WebThemeEngine::PartInnerSpinButton) {
+    native_theme_extra_params->inner_spin.spin_up =
+        extra_params->innerSpin.spinUp;
+    native_theme_extra_params->inner_spin.read_only =
+        extra_params->innerSpin.readOnly;
+  } else if (part == WebKit::WebThemeEngine::PartProgressBar) {
+    native_theme_extra_params->progress_bar.determinate =
+        extra_params->progressBar.determinate;
+    native_theme_extra_params->progress_bar.value_rect_x =
+        extra_params->progressBar.valueRectX;
+    native_theme_extra_params->progress_bar.value_rect_y =
+        extra_params->progressBar.valueRectY;
+    native_theme_extra_params->progress_bar.value_rect_width =
+        extra_params->progressBar.valueRectWidth;
+    native_theme_extra_params->progress_bar.value_rect_height =
+        extra_params->progressBar.valueRectHeight;
   }
 }