Use native theme colors for textfields; etc.

ui/native_theme/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/native_theme/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
@@ skipping 31 matching lines @@
 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde);
 const SkColor kTextButtonEnabledColor = SkColorSetRGB(6, 45, 117);
 const SkColor kTextButtonDisabledColor = SkColorSetRGB(161, 161, 146);
 const SkColor kTextButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255);
 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor;
 // MenuItem:
 const SkColor kEnabledMenuItemForegroundColor = kTextButtonEnabledColor;
 const SkColor kDisabledMenuItemForegroundColor = kTextButtonDisabledColor;
 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(246, 249, 253);
 const SkColor kMenuSeparatorColor = SkColorSetARGB(50, 0, 0, 0);
-// Label:
-const SkColor kLabelEnabledColor = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
-const SkColor kLabelDisabledColor = color_utils::GetSysSkColor(COLOR_GRAYTEXT);
-const SkColor kLabelBackgroundColor = color_utils::GetSysSkColor(COLOR_WINDOW);
 // Textfield:
-const SkColor kTextfieldDefaultColor = SK_ColorBLACK;
-const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
-const SkColor kTextfieldSelectionColor = SK_ColorWHITE;
-const SkColor kTextfieldSelectionBackgroundFocused =
-    SkColorSetRGB(0x1D, 0x90, 0xFF);
 const SkColor kTextfieldSelectionBackgroundUnfocused = SK_ColorLTGRAY;
 
-SkColor WinColorToSkColor(COLORREF color) {
-  return SkColorSetRGB(GetRValue(color), GetGValue(color), GetBValue(color));
-}
+// Windows system color IDs cached and updated by the native theme.
+const int kSystemColors[] = {
+  COLOR_3DFACE,
+  COLOR_GRAYTEXT,
+  COLOR_HIGHLIGHT,
+  COLOR_HIGHLIGHTTEXT,
+  COLOR_SCROLLBAR,
+  COLOR_WINDOW,
+  COLOR_WINDOWTEXT,
+};
 
 void SetCheckerboardShader(SkPaint* paint, const RECT& align_rect) {
   // Create a 2x2 checkerboard pattern using the 3D face and highlight colors.
-  SkColor face = skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE));
-  SkColor highlight = skia::COLORREFToSkColor(GetSysColor(COLOR_3DHILIGHT));
+  const SkColor face = color_utils::GetSysSkColor(COLOR_3DFACE);
+  const SkColor highlight = color_utils::GetSysSkColor(COLOR_3DHILIGHT);
   SkColor buffer[] = { face, highlight, highlight, face };
   // Confusing bit: we first create a temporary bitmap with our desired pattern,
   // then copy it to another bitmap.  The temporary bitmap doesn't take
   // ownership of the pixel data, and so will point to garbage when this
   // function returns.  The copy will copy the pixel data into a place owned by
   // the bitmap, which is in turn owned by the shader, etc., so it will live
   // until we're done using it.
   SkBitmap temp_bitmap;
   temp_bitmap.setConfig(SkBitmap::kARGB_8888_Config, 2, 2);
   temp_bitmap.setPixels(buffer);
@@ skipping 65 matching lines @@
   return E_NOTIMPL;
 }
 
 SkColor NativeThemeWin::GetThemeColorWithDefault(ThemeName theme,
                                                  int part_id,
                                                  int state_id,
                                                  int prop_id,
                                                  int default_sys_color) const {
   SkColor color;
   if (GetThemeColor(theme, part_id, state_id, prop_id, &color) != S_OK)
-    color = skia::COLORREFToSkColor(GetSysColor(default_sys_color));
+    color = color_utils::GetSysSkColor(default_sys_color);
   return color;
 }
 
 gfx::Size NativeThemeWin::GetThemeBorderSize(ThemeName theme) const {
   // For simplicity use the wildcard state==0, part==0, since it works
   // for the cases we currently depend on.
   int border;
   if (GetThemeInt(theme, 0, 0, TMT_BORDERSIZE, &border) == S_OK)
     return gfx::Size(border, border);
   else
@@ skipping 155 matching lines @@
     close_theme_ = reinterpret_cast<CloseThemeDataPtr>(
         GetProcAddress(theme_dll_, "CloseThemeData"));
     set_theme_properties_ = reinterpret_cast<SetThemeAppPropertiesPtr>(
         GetProcAddress(theme_dll_, "SetThemeAppProperties"));
     is_theme_active_ = reinterpret_cast<IsThemeActivePtr>(
         GetProcAddress(theme_dll_, "IsThemeActive"));
     get_theme_int_ = reinterpret_cast<GetThemeIntPtr>(
         GetProcAddress(theme_dll_, "GetThemeInt"));
   }
   memset(theme_handles_, 0, sizeof(theme_handles_));
+  // Initialize the cached system colors.
+  OnSysColorChange();

[sky, 2012/12/04 22:38:14]

I don't like calling a virtual method from a constructor. How about adding a
ResetColors() or something that this and OnSysColorChange call into.

[msw, 2012/12/05 02:09:56]

Done.

 }
 
 NativeThemeWin::~NativeThemeWin() {
   if (theme_dll_) {
     // todo (cpu): fix this soon.  Making a call to CloseHandles() here breaks
     // certain tests and the reliability bots.
     // CloseHandles();
     FreeLibrary(theme_dll_);
   }
 }
 
+void NativeThemeWin::OnSysColorChange() {
+  for (int i = 0; i < arraysize(kSystemColors); ++i)

[sky, 2012/12/04 22:38:14]

nit: use {} for the for loop.

[msw, 2012/12/05 02:09:56]

Done.

+    system_colors_[kSystemColors[i]] =
+        color_utils::GetSysSkColor(kSystemColors[i]);
+}
+
 void NativeThemeWin::PaintDirect(SkCanvas* canvas,
                                  Part part,
                                  State state,
                                  const gfx::Rect& rect,
                                  const ExtraParams& extra) const {
   skia::ScopedPlatformPaint scoped_platform_paint(canvas);
   HDC hdc = scoped_platform_paint.GetPlatformSurface();
 
   switch (part) {
     case kCheckbox:
@@ skipping 80 matching lines @@
   if (IsNewMenuStyleEnabled() &&
       CommonThemeGetSystemColor(color_id, &color)) {
     return color;
   }
 
   switch (color_id) {
     // Dialogs
     case kColorId_DialogBackground:
       // TODO(benrg): Should this use the new Windows theme functions? The old
       // code in DialogClientView::OnPaint used GetSysColor(COLOR_3DFACE).
-      return WinColorToSkColor(GetSysColor(COLOR_3DFACE));
+      return system_colors_[COLOR_3DFACE];
 
     // FocusableBorder
     case kColorId_FocusedBorderColor:
       return kFocusedBorderColor;
     case kColorId_UnfocusedBorderColor:
       return kUnfocusedBorderColor;
 
     // TextButton
     case kColorId_TextButtonBackgroundColor:
       return kTextButtonBackgroundColor;
@@ skipping 11 matching lines @@
       return kEnabledMenuItemForegroundColor;
     case kColorId_DisabledMenuItemForegroundColor:
       return kDisabledMenuItemForegroundColor;
     case kColorId_FocusedMenuItemBackgroundColor:
       return kFocusedMenuItemBackgroundColor;
     case kColorId_MenuSeparatorColor:
       return kMenuSeparatorColor;
 
     // Label
     case kColorId_LabelEnabledColor:
-      return kLabelEnabledColor;
+      return system_colors_[COLOR_WINDOWTEXT];
     case kColorId_LabelDisabledColor:
-      return kLabelDisabledColor;
+      return system_colors_[COLOR_GRAYTEXT];
     case kColorId_LabelBackgroundColor:
-      return kLabelBackgroundColor;
+      return system_colors_[COLOR_WINDOW];
 
     // Textfield
     case kColorId_TextfieldDefaultColor:
-      return kTextfieldDefaultColor;
+      return system_colors_[COLOR_WINDOWTEXT];
     case kColorId_TextfieldDefaultBackground:
-      return kTextfieldDefaultBackground;
+      return system_colors_[COLOR_WINDOW];
+    case kColorId_TextfieldReadOnlyColor:
+      return system_colors_[COLOR_GRAYTEXT];
+    case kColorId_TextfieldReadOnlyBackground:
+      return system_colors_[COLOR_3DFACE];
     case kColorId_TextfieldSelectionColor:
-      return kTextfieldSelectionColor;
+      return system_colors_[COLOR_HIGHLIGHTTEXT];
     case kColorId_TextfieldSelectionBackgroundFocused:
-      return kTextfieldSelectionBackgroundFocused;
+      return system_colors_[COLOR_HIGHLIGHT];
     case kColorId_TextfieldSelectionBackgroundUnfocused:
       return kTextfieldSelectionBackgroundUnfocused;
 
     default:
       NOTREACHED() << "Invalid color_id: " << color_id;
       break;
   }
   return kInvalidColorIdColor;
 }
 
@@ skipping 635 matching lines @@
       break;
     default:
       NOTREACHED() << "Invalid state: " << state;
       break;
   }
 
   if (handle && draw_theme_)
     return draw_theme_(handle, hdc, part_id, state_id, &rect_win, NULL);
 
   // Draw it manually.
-  const DWORD colorScrollbar = GetSysColor(COLOR_SCROLLBAR);
-  const DWORD color3DFace = GetSysColor(COLOR_3DFACE);
-  if ((colorScrollbar != color3DFace) &&
-      (colorScrollbar != GetSysColor(COLOR_WINDOW))) {
+  if ((system_colors_[COLOR_SCROLLBAR] != system_colors_[COLOR_3DFACE]) &&
+      (system_colors_[COLOR_SCROLLBAR] != system_colors_[COLOR_WINDOW])) {
     FillRect(hdc, &rect_win, reinterpret_cast<HBRUSH>(COLOR_SCROLLBAR + 1));
   } else {
     SkPaint paint;
     RECT align_rect = gfx::Rect(extra.track_x, extra.track_y, extra.track_width,
                                 extra.track_height).ToRECT();
     SetCheckerboardShader(&paint, align_rect);
     canvas->drawIRect(skia::RECTToSkIRect(rect_win), paint);
   }
   if (extra.classic_state & DFCS_PUSHED)
     InvertRect(hdc, &rect_win);
@@ skipping 798 matching lines @@
     handle = open_theme_(NULL, L"Spin");
     break;
   default:
     NOTREACHED();
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace ui