Remove random lonely semicolons.

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 <set>
 #include <utility>
@@ skipping 63 matching lines @@
 // to 0, which breaks -Wsentinel. Get back the normal definition of NULL.
 // TODO(thakis): Remove this once we update sysroots.
 #define __need_NULL
 #include <stddef.h>
 
 namespace libgtk2ui {
 
 namespace {
 
 class GtkThemeIconSource : public gfx::ImageSkiaSource {
-  public:
-    GtkThemeIconSource(int id, const char* icon, bool enabled)
-        : id_(id),
-          icon_(icon),
-          enabled_(enabled) {
+ public:
+  GtkThemeIconSource(int id, const char* icon, bool enabled)
+      : id_(id), icon_(icon), enabled_(enabled) {}
+
+  ~GtkThemeIconSource() override {}
+
+  gfx::ImageSkiaRep GetImageForScale(float scale) override {
+    ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
+    SkBitmap default_icon = rb.GetImageNamed(id_).AsBitmap();
+
+    int scalew = default_icon.width() * scale;
+    int scaleh = default_icon.height() * scale;
+
+    // Ask GTK to render the icon to a buffer, which we will steal from.
+    GtkIconTheme* icon_theme = gtk_icon_theme_get_default();
+    GdkPixbuf* gdk_icon = gtk_icon_theme_load_icon(
+        icon_theme, icon_, 20 * scale, (GtkIconLookupFlags)0, NULL);
+
+    // This can theoretically happen if an icon theme doesn't provide a
+    // specific image. This should realistically never happen, but I bet there
+    // are some theme authors who don't reliably provide all icons.
+    if (!gdk_icon)
+      return gfx::ImageSkiaRep();
+
+#if GTK_MAJOR_VERSION == 2
+    GtkIconSource* icon_source = gtk_icon_source_new();
+    gtk_icon_source_set_pixbuf(icon_source, gdk_icon);
+
+    GdkPixbuf* temp = gtk_style_render_icon(
+        gtk_rc_get_style(NativeThemeGtk2::instance()->GetButton()), icon_source,
+        GTK_TEXT_DIR_NONE, enabled_ ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE,
+        (GtkIconSize)-1, NativeThemeGtk2::instance()->GetButton(), NULL);
+
+    gtk_icon_source_free(icon_source);
+    g_object_unref(gdk_icon);
+
+    gdk_icon = temp;
+#endif
+
+    SkBitmap retval;
+    retval.allocN32Pixels(scalew, scaleh);
+    retval.eraseColor(0);
+
+    const SkBitmap icon = GdkPixbufToImageSkia(gdk_icon);
+    g_object_unref(gdk_icon);
+
+    SkCanvas canvas(retval);
+    SkPaint paint;
+
+#if GTK_MAJOR_VERSION > 2
+    if (!enabled_)
+      paint.setAlpha(128);
+#endif
+
+    canvas.drawBitmap(icon, (scalew / 2) - (icon.width() / 2),
+                      (scaleh / 2) - (icon.height() / 2), &paint);
+
+    return gfx::ImageSkiaRep(retval, scale);
+  }
+
+ private:
+  int id_;
+  const char* icon_;
+  bool enabled_;
+
+  DISALLOW_COPY_AND_ASSIGN(GtkThemeIconSource);
+};
+
+class GtkButtonImageSource : public gfx::ImageSkiaSource {
+ public:
+  GtkButtonImageSource(const char* idr_string, gfx::Size size)
+      : width_(size.width()), height_(size.height()) {
+    is_blue_ = !!strstr(idr_string, "IDR_BLUE");
+    focus_ = !!strstr(idr_string, "_FOCUSED_");
+
+    if (strstr(idr_string, "_DISABLED")) {
+      state_ = ui::NativeTheme::kDisabled;
+    } else if (strstr(idr_string, "_HOVER")) {
+      state_ = ui::NativeTheme::kHovered;
+    } else if (strstr(idr_string, "_PRESSED")) {
+      state_ = ui::NativeTheme::kPressed;
+    } else {
+      state_ = ui::NativeTheme::kNormal;
+    }
+  }
+
+  ~GtkButtonImageSource() override {}
+
+  gfx::ImageSkiaRep GetImageForScale(float scale) override {
+    int width = width_ * scale;
+    int height = height_ * scale;
+
+    SkBitmap border;
+    border.allocN32Pixels(width, height);
+    border.eraseColor(0);
+
+    // Create a temporary GTK button to snapshot
+    GtkWidget* window = gtk_offscreen_window_new();
+    GtkWidget* button = gtk_toggle_button_new();
+
+    if (state_ == ui::NativeTheme::kPressed)
+      gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), true);
+    else if (state_ == ui::NativeTheme::kDisabled)
+      gtk_widget_set_sensitive(button, false);
+
+    gtk_widget_set_size_request(button, width, height);
+    gtk_container_add(GTK_CONTAINER(window), button);
+
+    if (is_blue_)
+      TurnButtonBlue(button);
+
+    gtk_widget_show_all(window);
+
+    cairo_surface_t* surface = cairo_image_surface_create_for_data(
+        static_cast<unsigned char*>(border.getAddr(0, 0)),
+        CAIRO_FORMAT_ARGB32, width, height, width * 4);
+    cairo_t* cr = cairo_create(surface);
+
+#if GTK_MAJOR_VERSION == 2
+    if (focus_)
+      GTK_WIDGET_SET_FLAGS(button, GTK_HAS_FOCUS);
+
+    int w, h;
+    GdkPixmap* pixmap;
+
+    {
+      // http://crbug.com/346740
+      ANNOTATE_SCOPED_MEMORY_LEAK;
+      pixmap = gtk_widget_get_snapshot(button, NULL);
     }
 
-    ~GtkThemeIconSource() override {}
+    gdk_drawable_get_size(GDK_DRAWABLE(pixmap), &w, &h);
+    GdkColormap* colormap = gdk_drawable_get_colormap(pixmap);
+    GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable(
+        NULL, GDK_DRAWABLE(pixmap), colormap, 0, 0, 0, 0, w, h);
 
-    gfx::ImageSkiaRep GetImageForScale(float scale) override {
-      ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
-      SkBitmap default_icon = rb.GetImageNamed(id_).AsBitmap();
+    gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
+    cairo_paint(cr);
 
-      int scalew = default_icon.width() * scale;
-      int scaleh = default_icon.height() * scale;
+    g_object_unref(pixbuf);
+    g_object_unref(pixmap);
+#else
+    gtk_widget_draw(button, cr);
 
-      // Ask GTK to render the icon to a buffer, which we will steal from.
-      GtkIconTheme* icon_theme = gtk_icon_theme_get_default();
-      GdkPixbuf* gdk_icon = gtk_icon_theme_load_icon(
-          icon_theme,
-          icon_,
-          20 * scale,
-          (GtkIconLookupFlags)0,
-          NULL);
-
-      // This can theoretically happen if an icon theme doesn't provide a
-      // specific image. This should realistically never happen, but I bet there
-      // are some theme authors who don't reliably provide all icons.
-      if (!gdk_icon)
-        return gfx::ImageSkiaRep();
-
-#if GTK_MAJOR_VERSION == 2
-      GtkIconSource* icon_source = gtk_icon_source_new();
-      gtk_icon_source_set_pixbuf(icon_source, gdk_icon);
-
-      GdkPixbuf* temp = gtk_style_render_icon(
-          gtk_rc_get_style(NativeThemeGtk2::instance()->GetButton()),
-          icon_source,
-          GTK_TEXT_DIR_NONE,
-          enabled_ ? GTK_STATE_NORMAL : GTK_STATE_INSENSITIVE,
-          (GtkIconSize)-1,
-          NativeThemeGtk2::instance()->GetButton(),
-          NULL);
-
-      gtk_icon_source_free(icon_source);
-      g_object_unref(gdk_icon);
-
-      gdk_icon = temp;
+    // There's probably a better way to do this
+    if (focus_)
+      gtk_render_focus(gtk_widget_get_style_context(button), cr, 0, 0,
+                       width, height);
 #endif
 
-      SkBitmap retval;
-      retval.allocN32Pixels(scalew, scaleh);
-      retval.eraseColor(0);
+    cairo_destroy(cr);
+    cairo_surface_destroy(surface);
 
-      const SkBitmap icon = GdkPixbufToImageSkia(gdk_icon);
-      g_object_unref(gdk_icon);
+    gtk_widget_destroy(window);
 
-      SkCanvas canvas(retval);
-      SkPaint paint;
+    return gfx::ImageSkiaRep(border, scale);
+  }
 
-#if GTK_MAJOR_VERSION > 2
-      if (!enabled_)
-        paint.setAlpha(128);
-#endif
+ private:
+  bool is_blue_;
+  bool focus_;
+  ui::NativeTheme::State state_;
+  int width_;
+  int height_;
 
-      canvas.drawBitmap(icon,
-                        (scalew / 2) - (icon.width() / 2),
-                        (scaleh / 2) - (icon.height() / 2),
-                        &paint);
-
-      return gfx::ImageSkiaRep(retval, scale);
-    }
-
-  private:
-    int id_;
-    const char* icon_;
-    bool enabled_;
-
-    DISALLOW_COPY_AND_ASSIGN(GtkThemeIconSource);
+  DISALLOW_COPY_AND_ASSIGN(GtkButtonImageSource);
 };
 
+class GtkButtonPainter : public views::Painter {
+ public:
+  explicit GtkButtonPainter(std::string idr) : idr_(idr) {}
+  ~GtkButtonPainter() override {}
 
-class GtkButtonImageSource : public gfx::ImageSkiaSource {
-  public:
-    GtkButtonImageSource(const char* idr_string, gfx::Size size)
-        : width_(size.width()),
-          height_(size.height()) {
-      is_blue_ = !!strstr(idr_string, "IDR_BLUE");
-      focus_ = !!strstr(idr_string, "_FOCUSED_");
+  gfx::Size GetMinimumSize() const override { return gfx::Size(); }
+  void Paint(gfx::Canvas* canvas, const gfx::Size& size) override {
+    gfx::ImageSkiaSource* source = new GtkButtonImageSource(idr_.c_str(), size);
+    gfx::ImageSkia image(source, 1);
+    canvas->DrawImageInt(image, 0, 0);
+  }
 
-      if (strstr(idr_string, "_DISABLED")) {
-        state_ = ui::NativeTheme::kDisabled;
-      } else if (strstr(idr_string, "_HOVER")) {
-        state_ = ui::NativeTheme::kHovered;
-      } else if (strstr(idr_string, "_PRESSED")) {
-        state_ = ui::NativeTheme::kPressed;
-      } else {
-        state_ = ui::NativeTheme::kNormal;
-      }
-    }
+ private:
+  std::string idr_;
 
-    ~GtkButtonImageSource() override {}
-
-    gfx::ImageSkiaRep GetImageForScale(float scale) override {
-      int width = width_ * scale;
-      int height = height_ * scale;
-
-      SkBitmap border;
-      border.allocN32Pixels(width, height);
-      border.eraseColor(0);
-
-      // Create a temporary GTK button to snapshot
-      GtkWidget* window = gtk_offscreen_window_new();
-      GtkWidget* button = gtk_toggle_button_new();
-
-      if (state_ == ui::NativeTheme::kPressed)
-        gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(button), true);
-      else if (state_ == ui::NativeTheme::kDisabled)
-        gtk_widget_set_sensitive(button, false);
-
-      gtk_widget_set_size_request(button, width, height);
-      gtk_container_add(GTK_CONTAINER(window), button);
-
-      if (is_blue_)
-        TurnButtonBlue(button);
-
-      gtk_widget_show_all(window);
-
-
-      cairo_surface_t* surface = cairo_image_surface_create_for_data(
-        static_cast<unsigned char*>(border.getAddr(0, 0)),
-        CAIRO_FORMAT_ARGB32,
-        width, height,
-        width * 4);
-      cairo_t* cr = cairo_create(surface);
-
-#if GTK_MAJOR_VERSION == 2
-      if (focus_)
-        GTK_WIDGET_SET_FLAGS(button, GTK_HAS_FOCUS);
-
-      int w, h;
-      GdkPixmap* pixmap;
-
-      {
-        // http://crbug.com/346740
-        ANNOTATE_SCOPED_MEMORY_LEAK;
-        pixmap = gtk_widget_get_snapshot(button, NULL);
-      }
-
-      gdk_drawable_get_size(GDK_DRAWABLE(pixmap), &w, &h);
-      GdkColormap* colormap = gdk_drawable_get_colormap(pixmap);
-      GdkPixbuf* pixbuf = gdk_pixbuf_get_from_drawable(NULL,
-                                                       GDK_DRAWABLE(pixmap),
-                                                       colormap,
-                                                       0, 0, 0, 0, w, h);
-
-      gdk_cairo_set_source_pixbuf(cr, pixbuf, 0, 0);
-      cairo_paint(cr);
-
-      g_object_unref(pixbuf);
-      g_object_unref(pixmap);
-#else
-      gtk_widget_draw(button, cr);
-
-      // There's probably a better way to do this
-      if (focus_)
-        gtk_render_focus(gtk_widget_get_style_context(button),
-                         cr, 0, 0, width, height);
-#endif
-
-      cairo_destroy(cr);
-      cairo_surface_destroy(surface);
-
-      gtk_widget_destroy(window);
-
-      return gfx::ImageSkiaRep(border, scale);
-    }
-
-  private:
-    bool is_blue_;
-    bool focus_;
-    ui::NativeTheme::State state_;
-    int width_;
-    int height_;
-
-    DISALLOW_COPY_AND_ASSIGN(GtkButtonImageSource);
+  DISALLOW_COPY_AND_ASSIGN(GtkButtonPainter);
 };
 
-
-class GtkButtonPainter : public views::Painter {
-  public:
-    explicit GtkButtonPainter(std::string idr) : idr_(idr) {}
-    ~GtkButtonPainter() override {}
-
-    gfx::Size GetMinimumSize() const override {
-      return gfx::Size();
-    }
-    void Paint(gfx::Canvas* canvas, const gfx::Size& size) override {
-      gfx::ImageSkiaSource* source =
-          new GtkButtonImageSource(idr_.c_str(), size);
-      gfx::ImageSkia image(source, 1);
-      canvas->DrawImageInt(image, 0, 0);
-    }
-
-  private:
-    std::string idr_;
-
-    DISALLOW_COPY_AND_ASSIGN(GtkButtonPainter);
-};
-
-
-
 struct GObjectDeleter {
   void operator()(void* ptr) {
     g_object_unref(ptr);
   }
 };
 struct GtkIconInfoDeleter {
   void operator()(GtkIconInfo* ptr) {
     G_GNUC_BEGIN_IGNORE_DEPRECATIONS
     gtk_icon_info_free(ptr);
     G_GNUC_END_IGNORE_DEPRECATIONS
@@ skipping 470 matching lines @@
 
     if (border->PaintsButtonState(paintstate[i].focus, paintstate[i].state)) {
       std::string idr = is_blue ? paintstate[i].idr_blue : paintstate[i].idr;
       painter = new GtkButtonPainter(idr);
     }
 
     gtk_border->SetPainter(paintstate[i].focus, paintstate[i].state, painter);
   }
 
   return std::move(gtk_border);
-  ;
 }
 
 void Gtk2UI::AddWindowButtonOrderObserver(
     views::WindowButtonOrderObserver* observer) {
   if (!leading_buttons_.empty() || !trailing_buttons_.empty()) {
     observer->OnWindowButtonOrderingChange(leading_buttons_,
                                            trailing_buttons_);
   }
 
   observer_list_.AddObserver(observer);
@@ skipping 586 matching lines @@
   const float rounded = roundf(scale * 10) / 10;
   // See crbug.com/484400
   return rounded < 1.3 ? 1.0 : rounded;
 }
 
 }  // namespace libgtk2ui
 
 views::LinuxUI* BuildGtk2UI() {
   return new libgtk2ui::Gtk2UI;
 }