Gtk3: Whitelist X11 backend

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>
@@ skipping 35 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 {
 
 // TODO(erg): ThemeService has a whole interface just for reading default
 // constants. Figure out what to do with that more long term; for now, just
 // copy the constants themselves here.
 const color_utils::HSL kDefaultTintFrameIncognito = {-1, 0.2f, 0.35f};
 const color_utils::HSL kDefaultTintFrameIncognitoInactive = {-1, 0.3f, 0.6f};
 
@@ skipping 126 matching lines @@
 aura::Window* GetAuraTransientParent(GtkWidget* dialog) {
   return reinterpret_cast<aura::Window*>(
       g_object_get_data(G_OBJECT(dialog), kAuraTransientParent));
 }
 
 void ClearAuraTransientParent(GtkWidget* dialog) {
   g_object_set_data(G_OBJECT(dialog), kAuraTransientParent, nullptr);
 }
 
 #if GTK_MAJOR_VERSION > 2
+void* GetGdkSharedLibrary() {
+  std::string lib_name =
+      "libgdk-" + std::to_string(GTK_MAJOR_VERSION) + ".so.0";

[Elliot Glaysher, 2017/03/20 21:01:41]

Is this ever not 3?

[Tom (Use chromium acct), 2017/03/20 21:04:46]

For now it is, but we'll need it for gtk4 ;)

+  static void* gdk_lib = dlopen(lib_name.c_str(), RTLD_LAZY);
+  DCHECK(gdk_lib);
+  return gdk_lib;
+}
+
+void* GetGtkSharedLibrary() {
+  std::string lib_name =
+      "libgtk-" + std::to_string(GTK_MAJOR_VERSION) + ".so.0";
+  static void* gtk_lib = dlopen(lib_name.c_str(), RTLD_LAZY);
+  DCHECK(gtk_lib);
+  return gtk_lib;
+}
+
 CairoSurface::CairoSurface(SkBitmap& bitmap)
     : surface_(cairo_image_surface_create_for_data(
           static_cast<unsigned char*>(bitmap.getAddr(0, 0)),
           CAIRO_FORMAT_ARGB32,
           bitmap.width(),
           bitmap.height(),
           cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, bitmap.width()))),
       cairo_(cairo_create(surface_)) {}
 
 CairoSurface::CairoSurface(const gfx::Size& size)
@@ skipping 120 matching lines @@
           break;
         case ':':
           part_type = CSS_PSEUDOCLASS;
           break;
         default:
           NOTREACHED();
       }
     } else {
       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"));
+              GetGtkSharedLibrary(), "gtk_widget_path_iter_set_object_name"));
       switch (part_type) {
         case CSS_NAME: {
           if (GtkVersionCheck(3, 20)) {
             _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: {
@@ skipping 25 matching lines @@
     }
   }
 
   // Always add a "chromium" class so that themes can style chromium
   // widgets specially if they want to.
   gtk_widget_path_iter_add_class(path, -1, "chromium");
 
   if (GtkVersionCheck(3, 14)) {
     static auto* _gtk_widget_path_iter_set_state =
         reinterpret_cast<void (*)(GtkWidgetPath*, gint, GtkStateFlags)>(
-            dlsym(GetGtk3SharedLibrary(), "gtk_widget_path_iter_set_state"));
+            dlsym(GetGtkSharedLibrary(), "gtk_widget_path_iter_set_state"));
     DCHECK(_gtk_widget_path_iter_set_state);
     _gtk_widget_path_iter_set_state(path, -1, state);
   }
 
   ScopedStyleContext child_context(gtk_style_context_new());
   gtk_style_context_set_path(child_context, path);
   if (GtkVersionCheck(3, 14)) {
     gtk_style_context_set_state(child_context, state);
   } else {
     GtkStateFlags child_state = state;
@@ skipping 141 matching lines @@
   }
 
   CairoSurface surface(gfx::Size(w, h));
   gtk_render_background(context, surface.cairo(), 0, 0, w, h);
   gtk_render_frame(context, surface.cairo(), 0, 0, w, h);
   return surface.GetAveragePixelValue(false);
 }
 #endif
 
 }  // namespace libgtkui