[Merge to M59] Gtk3: Fix black patches on GtkFileChooser dialogs

chrome/browser/ui/libgtkui/native_theme_gtk3.cc

 // Copyright 2016 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 "chrome/browser/ui/libgtkui/native_theme_gtk3.h"
 
 #include <gtk/gtk.h>
 
 #include "chrome/browser/ui/libgtkui/chrome_gtk_frame.h"
 #include "chrome/browser/ui/libgtkui/chrome_gtk_menu_subclasses.h"
 #include "chrome/browser/ui/libgtkui/gtk_util.h"
 #include "chrome/browser/ui/libgtkui/skia_utils_gtk.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/color_utils.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/skbitmap_operations.h"
 #include "ui/native_theme/native_theme_dark_aura.h"
 
 namespace libgtkui {
 
 namespace {
 
 enum BackgroundRenderMode {
   BG_RENDER_NORMAL,
   BG_RENDER_NONE,
   BG_RENDER_RECURSIVE,
 };
 
+std::string GetGtkSettingsStringProperty(GtkSettings* settings,
+                                         const gchar* prop_name) {
+  GValue layout = G_VALUE_INIT;
+  g_value_init(&layout, G_TYPE_STRING);
+  g_object_get_property(G_OBJECT(settings), prop_name, &layout);
+  DCHECK(G_VALUE_HOLDS_STRING(&layout));
+  std::string prop_value(g_value_get_string(&layout));
+  g_value_unset(&layout);
+  return prop_value;
+}
+
 SkBitmap GetWidgetBitmap(const gfx::Size& size,
                          GtkStyleContext* context,
                          BackgroundRenderMode bg_mode,
                          bool render_frame) {
   DCHECK(bg_mode != BG_RENDER_NONE || render_frame);
   SkBitmap bitmap;
   bitmap.allocN32Pixels(size.width(), size.height());
   bitmap.eraseColor(0);
 
   CairoSurface surface(bitmap);
@@ skipping 327 matching lines @@
       return fallback_theme->GetSystemColor(color_id);
     }
 
     case ui::NativeTheme::kColorId_NumColors:
       NOTREACHED();
       break;
   }
   return kInvalidColorIdColor;
 }
 
-void OnThemeChanged(GObject* obj, GParamSpec* param, NativeThemeGtk3* theme) {
-  theme->ResetColorCache();
-}
-
 }  // namespace
 
 // static
 NativeThemeGtk3* NativeThemeGtk3::instance() {
   CR_DEFINE_STATIC_LOCAL(NativeThemeGtk3, s_native_theme, ());
   return &s_native_theme;
 }
 
-// Constructors automatically called
 NativeThemeGtk3::NativeThemeGtk3() {
   // These types are needed by g_type_from_name(), but may not be registered at
   // this point.  We need the g_type_class magic to make sure the compiler
   // doesn't optimize away this code.
   g_type_class_unref(g_type_class_ref(gtk_button_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_entry_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_info_bar_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_label_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_menu_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_menu_bar_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_menu_item_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_range_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_scrollbar_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_scrolled_window_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_separator_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_spinner_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_text_view_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_tooltip_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_tree_view_get_type()));
   g_type_class_unref(g_type_class_ref(gtk_window_get_type()));
 
   g_signal_connect_after(gtk_settings_get_default(), "notify::gtk-theme-name",
-                         G_CALLBACK(OnThemeChanged), this);
+                         G_CALLBACK(OnThemeChangedThunk), this);
+  OnThemeChanged(gtk_settings_get_default(), nullptr);
 }
 
-// This doesn't actually get called
-NativeThemeGtk3::~NativeThemeGtk3() {}
+NativeThemeGtk3::~NativeThemeGtk3() {
+  NOTREACHED();
+}
 
-void NativeThemeGtk3::ResetColorCache() {
+void NativeThemeGtk3::SetThemeCssOverride(ScopedCssProvider provider) {
+  if (theme_css_override_) {
+    gtk_style_context_remove_provider_for_screen(
+        gdk_screen_get_default(),
+        GTK_STYLE_PROVIDER(theme_css_override_.get()));
+  }
+  theme_css_override_ = std::move(provider);
+  if (theme_css_override_) {
+    gtk_style_context_add_provider_for_screen(
+        gdk_screen_get_default(), GTK_STYLE_PROVIDER(theme_css_override_.get()),
+        GTK_STYLE_PROVIDER_PRIORITY_APPLICATION);
+  }
+}
+
+void NativeThemeGtk3::OnThemeChanged(GtkSettings* settings,
+                                     GtkParamSpec* param) {
+  SetThemeCssOverride(ScopedCssProvider());
   for (auto& color : color_cache_)
     color = base::nullopt;
+
+  // Hack to workaround a bug on GNOME standard themes which would
+  // cause black patches to be rendered on GtkFileChooser dialogs.
+  std::string theme_name =
+      GetGtkSettingsStringProperty(settings, "gtk-theme-name");
+  if (!GtkVersionCheck(3, 14)) {
+    if (theme_name == "Adwaita") {
+      SetThemeCssOverride(GetCssProvider(
+          "GtkFileChooser GtkPaned { background-color: @theme_bg_color; }"));
+    } else if (theme_name == "HighContrast") {
+      SetThemeCssOverride(GetCssProvider(
+          "GtkFileChooser GtkPaned { background-color: @theme_base_color; }"));
+    }
+  }
 }
 
 SkColor NativeThemeGtk3::GetSystemColor(ColorId color_id) const {
   if (color_cache_[color_id])
     return color_cache_[color_id].value();
 
   SkColor color = SkColorFromColorId(color_id);
   color_cache_[color_id] = color;
   return color;
 }
@@ skipping 162 matching lines @@
 
   if (frame_top_area.incognito) {
     bitmap = SkBitmapOperations::CreateHSLShiftedBitmap(
         bitmap, kDefaultTintFrameIncognito);
   }
 
   canvas->drawBitmap(bitmap, rect.x(), rect.y());
 }
 
 }  // namespace libgtkui