Only calculate the GTK scrollbar colors once and then update all RenderPreferences on theme change.

BUG=10949
TEST=none

Review URL: http://codereview.chromium.org/525016

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35712 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 1 insertions, 28 deletions

diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc
index 5b078fb..75a5acf 100644
--- a/chrome/common/gtk_util.cc
+++ b/chrome/common/gtk_util.cc
@@ -440,8 +440,7 @@ GtkWidget* IndentWidget(GtkWidget* content) {
   return content_alignment;
 }
 
-void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs,
-                                      bool use_gtk_theme) {
+void UpdateGtkFontSettings(RendererPreferences* prefs) {
   DCHECK(prefs);
 
   gint antialias = 0;
@@ -490,32 +489,6 @@ void InitRendererPrefsFromGtkSettings(RendererPreferences* prefs,
     }
   }
 
-  static GtkWidget* fixed = gtk_fixed_new();
-  GtkStyle* style = gtk_rc_get_style(fixed);
-  // base[SELECTED] seems more appropriate but in practice it is often too light
-  // to be easily visible.
-  GdkColor color = style->bg[GTK_STATE_SELECTED];
-  prefs->focus_ring_color =
-      SkColorSetRGB(color.red / 257, color.green / 257, color.blue / 257);
-
-  GdkColor thumb_active_color, thumb_inactive_color, track_color;
-  GtkThemeProvider::GetScrollbarColors(&thumb_active_color,
-                                       &thumb_inactive_color,
-                                       &track_color,
-                                       use_gtk_theme);
-  prefs->thumb_active_color =
-      SkColorSetRGB(thumb_active_color.red   / 257,
-                    thumb_active_color.green / 257,
-                    thumb_active_color.blue  / 257);
-  prefs->thumb_inactive_color =
-      SkColorSetRGB(thumb_inactive_color.red   / 257,
-                    thumb_inactive_color.green / 257,
-                    thumb_inactive_color.blue  / 257);
-  prefs->track_color =
-      SkColorSetRGB(track_color.red   / 257,
-                    track_color.green / 257,
-                    track_color.blue  / 257);
-
   if (hint_style)
     g_free(hint_style);
   if (rgba_style)