Linux: fix Gtk3 compile when using wheezy sysroot

chrome/browser/ui/libgtk2ui/gtk2_ui.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/libgtk2ui/gtk2_ui.h"
 
 #include <math.h>
 #include <pango/pango.h>
 #include <X11/Xcursor/Xcursor.h>
 #include <set>
@@ skipping 219 matching lines @@
 // 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.
 //
 // Default tints.
 const color_utils::HSL kDefaultTintFrameIncognito = { -1, 0.2f, 0.35f };
 const color_utils::HSL kDefaultTintFrameIncognitoInactive = { -1, 0.3f, 0.6f };
 
 #if GTK_MAJOR_VERSION == 3
 const color_utils::HSL kDefaultTintFrameInactive = { -1, -1, 0.75f };
-
-// The size of the rendered toolbar image.
-const int kToolbarImageWidth = 64;
-const int kToolbarImageHeight = 128;
 #endif  // GTK_MAJOR_VERSION == 3
 
 // Picks a button tint from a set of background colors. While
 // |accent_color| will usually be the same color through a theme, this
 // function will get called with the normal GtkLabel |text_color|/GtkWindow
 // |background_color| pair and the GtkEntry |text_color|/|background_color|
 // pair. While 3/4 of the time the resulting tint will be the same, themes that
 // have a dark window background (with light text) and a light text entry (with
 // dark text) will get better icons with this separated out.
 void PickButtonTintFromColors(SkColor accent_color,
@@ skipping 676 matching lines @@
       frame_color,
       kDefaultTintFrameIncognitoInactive);
   theme->GetChromeStyleColor("incognito-inactive-frame-color", &temp_color);
   colors_[ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE] = temp_color;
 #else
   auto set_frame_color = [this](int color_id) {
     // Render a GtkHeaderBar as our title bar, cropping out any curved edges
     // on the left and right sides. Also remove the bottom border for good
     // measure.
     SkBitmap bitmap;
-    bitmap.allocN32Pixels(kToolbarImageWidth, 40);
+    bitmap.allocN32Pixels(1, 1);
     bitmap.eraseColor(0);
 
-    static GtkWidget* title = nullptr;
-    if (!title) {
-      title = gtk_header_bar_new();
-      gtk_widget_set_size_request(title, kToolbarImageWidth * 2, 48);
+    static GtkWidget* menu = nullptr;
+    if (!menu) {
+      menu = gtk_menu_bar_new();
+      gtk_widget_set_size_request(menu, 1, 1);
 
       GtkWidget* window = gtk_offscreen_window_new();
-      gtk_container_add(GTK_CONTAINER(window), title);
+      gtk_container_add(GTK_CONTAINER(window), menu);
 
       gtk_widget_show_all(window);
     }
 
     cairo_surface_t* surface = cairo_image_surface_create_for_data(
         static_cast<unsigned char*>(bitmap.getAddr(0, 0)), CAIRO_FORMAT_ARGB32,
-        bitmap.width(), bitmap.height(), bitmap.width() * 4);
+        bitmap.width(), bitmap.height(),
+        cairo_format_stride_for_width(CAIRO_FORMAT_ARGB32, 1));
     cairo_t* cr = cairo_create(surface);
-    cairo_translate(cr, kToolbarImageWidth / -2, 0);
-    gtk_widget_draw(title, cr);
+    gtk_widget_draw(menu, cr);
     cairo_destroy(cr);
     cairo_surface_destroy(surface);
 
     switch (color_id) {
       case ThemeProperties::COLOR_FRAME_INACTIVE:
         bitmap = SkBitmapOperations::CreateHSLShiftedBitmap(
             bitmap, kDefaultTintFrameInactive);
         break;
       case ThemeProperties::COLOR_FRAME_INCOGNITO:
         bitmap = SkBitmapOperations::CreateHSLShiftedBitmap(
             bitmap, kDefaultTintFrameIncognito);
         break;
       case ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE:
         bitmap = SkBitmapOperations::CreateHSLShiftedBitmap(
             bitmap, kDefaultTintFrameIncognitoInactive);
         break;
     }
 
     bitmap.lockPixels();
-    colors_[color_id] =
-        bitmap.getColor(bitmap.width() / 2, bitmap.height() - 1);
+    colors_[color_id] = bitmap.getColor(0, 0);
     bitmap.unlockPixels();
   };
 
   set_frame_color(ThemeProperties::COLOR_FRAME);
   set_frame_color(ThemeProperties::COLOR_FRAME_INACTIVE);
   set_frame_color(ThemeProperties::COLOR_FRAME_INCOGNITO);
   set_frame_color(ThemeProperties::COLOR_FRAME_INCOGNITO_INACTIVE);
 #endif
 }
 
@@ skipping 96 matching lines @@
   // Blacklist scaling factors <130% (crbug.com/484400) and round
   // to 1 decimal to prevent rendering problems (crbug.com/485183).
   return scale < 1.3f ? 1.0f : roundf(scale * 10) / 10;
 }
 
 }  // namespace libgtk2ui
 
 views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }