Initial gtk3 support

chrome/browser/ui/libgtk2ui/gtk2_border.cc

Index: chrome/browser/ui/libgtk2ui/gtk2_border.cc
diff --git a/chrome/browser/ui/libgtk2ui/gtk2_border.cc b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
index 8839f0b534fae15067f478470dd027fcc2170643..a00c725ca87c36a2dbf78742cf4b9b34a96981f7 100644
--- a/chrome/browser/ui/libgtk2ui/gtk2_border.cc
+++ b/chrome/browser/ui/libgtk2ui/gtk2_border.cc
@@ -16,7 +16,6 @@
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/skia_util.h"
-#include "ui/views/controls/button/blue_button.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/button/label_button_border.h"
 #include "ui/views/native_theme_delegate.h"
@@ -26,46 +25,6 @@ using views::NativeThemeDelegate;
 
 namespace libgtk2ui {
 
-namespace {
-
-const int kNumberOfFocusedStates = 2;
-
-class ButtonImageSkiaSource : public gfx::ImageSkiaSource {
- public:
-  ButtonImageSkiaSource(const Gtk2UI* gtk2_ui,
-                        const GtkStateType state,
-                        const bool focused,
-                        const bool call_to_action,
-                        const gfx::Size& size)
-      : gtk2_ui_(gtk2_ui),
-        state_(state),
-        focused_(focused),
-        call_to_action_(call_to_action),
-        size_(size) {
-  }
-
-  ~ButtonImageSkiaSource() override {}
-
-  gfx::ImageSkiaRep GetImageForScale(float scale) override {
-    int w = size_.width() * scale;
-    int h = size_.height() * scale;
-    return gfx::ImageSkiaRep(
-        gtk2_ui_->DrawGtkButtonBorder(state_, focused_, call_to_action_, w, h),
-        scale);
-  }
-
- private:
-  const Gtk2UI* gtk2_ui_;
-  const GtkStateType state_;
-  const bool focused_;
-  const bool call_to_action_;
-  const gfx::Size size_;
-
-  DISALLOW_COPY_AND_ASSIGN(ButtonImageSkiaSource);
-};
-
-}  // namespace
-
 Gtk2Border::Gtk2Border(Gtk2UI* gtk2_ui,
                        views::LabelButton* owning_button,
                        scoped_ptr<views::LabelButtonBorder> border)
@@ -119,7 +78,7 @@ gfx::Size Gtk2Border::GetMinimumSize() const {
 
 void Gtk2Border::OnNativeThemeUpdated(ui::NativeTheme* observed_theme) {
   DCHECK_EQ(observed_theme, NativeThemeGtk2::instance());
-  for (int i = 0; i < kNumberOfFocusedStates; ++i) {
+  for (int i = 0; i < 2; ++i) {

[Elliot Glaysher, 2015/09/01 22:43:58]

Probably want to keep the constant.

[knthzh, 2015/09/02 05:48:29]

I did it to match the declaration in gtk2_border.h,
gfx::ImageSkia button_images_[2][views::Button::STATE_COUNT];

How about replacing the 2's with a macro?

[Elliot Glaysher, 2015/09/03 19:28:00]

Macros are highly, highly discouraged. (You'll still find some usages of
#define, but it shouldn't be routine.)

     for (int j = 0; j < views::Button::STATE_COUNT; ++j) {
       button_images_[i][j] = gfx::ImageSkia();
     }
@@ -141,16 +100,11 @@ void Gtk2Border::PaintState(const ui::NativeTheme::State state,
     gfx::ImageSkia* image = &button_images_[focused][views_state];
 
     if (image->isNull() || image->size() != rect.size()) {
-      bool call_to_action = owning_button_->GetClassName() ==
-          views::BlueButton::kViewClassName;
-      GtkStateType gtk_state = GetGtkState(state);
-      *image = gfx::ImageSkia(
-          new ButtonImageSkiaSource(gtk2_ui_,
-                                    gtk_state,
-                                    focused,
-                                    call_to_action,
-                                    rect.size()),
-          rect.size());
+      *image = gfx::ImageSkia::CreateFrom1xBitmap(
+          gtk2_ui_->DrawGtkButtonBorder(owning_button_->GetClassName(),
+                                        state,
+                                        rect.width(),
+                                        rect.height()));

[Elliot Glaysher, 2015/09/01 22:43:58]

So what's the motivation for this change here? The previous version appears to
create the 2x scaled version correctly, and this one just scales.

[knthzh, 2015/09/02 05:48:29]

Oops, misunderstood the original code. I definitely broke hidpi borders. But
hidpi icons were already broken, so the Chrome/gtk/hidpi combo wasn't working in
the first place.

For the sake of not making this patch even larger, I'll fix hidpi in a separate
patch after this one gets committed.

     }
     canvas->DrawImageInt(*image, rect.x(), rect.y());
   }