Gtk3: Add support for Gtk3.20 themes

chrome/browser/ui/libgtkui/gtk_util.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 "chrome/browser/ui/libgtkui/gtk_util.h"
 
+#include <dlfcn.h>
 #include <gdk/gdk.h>
 #include <gdk/gdkx.h>
 #include <gtk/gtk.h>
 #include <stddef.h>
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/debug/leak_annotations.h"
 #include "base/environment.h"
@@ skipping 28 matching lines @@
   {
     // http://crbug.com/423873
     ANNOTATE_SCOPED_MEMORY_LEAK;
     init_func(&argc, &argv_pointer);
   }
   for (size_t i = 0; i < args.size(); ++i) {
     free(argv[i]);
   }
 }
 
+#if GTK_MAJOR_VERSION == 3
+void* GetGtk3SharedLibrary() {
+  static void* gtk3lib = dlopen("libgtk-3.so.0", RTLD_LAZY);
+  DCHECK(gtk3lib);
+  return gtk3lib;
+}
+#endif
+
 }  // namespace
 
 namespace libgtkui {
 
 // Theme colors returned by GetSystemColor().
 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
 const SkColor kURLTextColor = SkColorSetRGB(0x0b, 0x80, 0x43);
 
 SkColor NormalURLColor(SkColor foreground) {
   color_utils::HSL fg_hsl, hue_hsl;
@@ skipping 127 matching lines @@
 }
 
 #if GTK_MAJOR_VERSION > 2
 ScopedStyleContext AppendNode(GtkStyleContext* context,
                               const std::string& css_node) {
   GtkWidgetPath* path =
       context ? gtk_widget_path_copy(gtk_style_context_get_path(context))
               : gtk_widget_path_new();
 
   enum {
-    // TODO(thomasanderson): Add CSS_NAME here to handle the Gtk3.20 case.
     CSS_TYPE,
+    CSS_NAME,
     CSS_CLASS,
     CSS_PSEUDOCLASS,
   } part_type = CSS_TYPE;
   static const struct {
     const char* name;
     GtkStateFlags state_flag;
   } pseudo_classes[] = {
       {"active", GTK_STATE_FLAG_ACTIVE},
       {"hover", GTK_STATE_FLAG_PRELIGHT},
       {"selected", GTK_STATE_FLAG_SELECTED},
       {"disabled", GTK_STATE_FLAG_INSENSITIVE},
       {"indeterminate", GTK_STATE_FLAG_INCONSISTENT},
       {"focus", GTK_STATE_FLAG_FOCUSED},
       {"backdrop", GTK_STATE_FLAG_BACKDROP},
       // TODO(thomasanderson): These state flags are only available in
       // GTK 3.10 or later, which is unavailable in the wheezy
       // sysroot.  Add them once the sysroot is updated to jessie.
       // { "link",          GTK_STATE_FLAG_LINK },
       // { "visited",       GTK_STATE_FLAG_VISITED },
       // { "checked",       GTK_STATE_FLAG_CHECKED },
   };
   GtkStateFlags state =
       context ? gtk_style_context_get_state(context) : GTK_STATE_FLAG_NORMAL;
-  base::StringTokenizer t(css_node, ".:");
+  base::StringTokenizer t(css_node, ".:#");
   t.set_options(base::StringTokenizer::RETURN_DELIMS);
   while (t.GetNext()) {
     if (t.token_is_delim()) {
       if (t.token_begin() == css_node.begin()) {
         // Special case for the first token.
         gtk_widget_path_append_type(path, G_TYPE_NONE);
       }
       switch (*t.token_begin()) {
+        case '#':
+          part_type = CSS_NAME;
+          break;
         case '.':
           part_type = CSS_CLASS;
           break;
         case ':':
           part_type = CSS_PSEUDOCLASS;
           break;
         default:
           NOTREACHED();
       }
     } else {
       switch (part_type) {
+        case CSS_NAME: {
+          static auto* _gtk_widget_path_iter_set_object_name =
+              reinterpret_cast<void (*)(GtkWidgetPath*, gint, const char*)>(
+                  dlsym(GetGtk3SharedLibrary(),
+                        "gtk_widget_path_iter_set_object_name"));

[Elliot Glaysher, 2017/01/05 18:14:45]

You probably want this inside the version checked if block.

[Tom (Use chromium acct), 2017/01/05 20:27:05]

Done.

+          if (gtk_get_major_version() > 3 ||
+              (gtk_get_major_version() == 3 && gtk_get_minor_version() >= 20)) {
+            DCHECK(_gtk_widget_path_iter_set_object_name);
+            _gtk_widget_path_iter_set_object_name(path, -1, t.token().c_str());
+          } else {
+            gtk_widget_path_iter_add_class(path, -1, t.token().c_str());
+          }
+          break;
+        }
         case CSS_TYPE: {
           GType type = g_type_from_name(t.token().c_str());
           DCHECK(type);
           gtk_widget_path_append_type(path, type);
           break;
         }
         case CSS_CLASS: {
           gtk_widget_path_iter_add_class(path, -1, t.token().c_str());
           break;
         }
@@ skipping 142 matching lines @@
   }
 
   AddBorders(context);
   PixelSurface surface;
   gtk_render_frame(context, surface.cairo(), 0, 0, 1, 1);
   return surface.GetPixelValue();
 }
 #endif
 
 }  // namespace libgtkui