Revert 96674 - Gtk: Make click target of tabs match their appearance.

chrome/browser/ui/gtk/tabs/tab_gtk.cc

 // Copyright (c) 2011 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/gtk/tabs/tab_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/memory/singleton.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/gtk/accelerators_gtk.h"
-#include "chrome/browser/ui/gtk/gtk_input_event_box.h"
 #include "chrome/browser/ui/gtk/menu_gtk.h"
 #include "chrome/browser/ui/gtk/tabs/tab_strip_menu_controller.h"
 #include "chrome/browser/ui/tabs/tab_menu_model.h"
-#include "chrome/browser/ui/tabs/tab_resources.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
-#include "ui/base/gtk/scoped_handle_gtk.h"
 #include "ui/base/models/accelerator_gtk.h"
 #include "ui/gfx/path.h"
 
 namespace {
 
 // Returns the width of the title for the current font, in pixels.
 int GetTitleWidth(gfx::Font* font, string16 title) {
   DCHECK(font);
   if (title.empty())
     return 0;
@@ skipping 26 matching lines @@
 TabGtk::TabGtk(TabDelegate* delegate)
     : TabRendererGtk(delegate->GetThemeProvider()),
       delegate_(delegate),
       closing_(false),
       dragging_(false),
       last_mouse_down_(NULL),
       drag_widget_(NULL),
       title_width_(0),
       ALLOW_THIS_IN_INITIALIZER_LIST(destroy_factory_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(drag_end_factory_(this)) {
-  event_box_ = gtk_input_event_box_new();
+  event_box_ = gtk_event_box_new();
+  gtk_event_box_set_visible_window(GTK_EVENT_BOX(event_box_), FALSE);
   g_signal_connect(event_box_, "button-press-event",
                    G_CALLBACK(OnButtonPressEventThunk), this);
   g_signal_connect(event_box_, "button-release-event",
                    G_CALLBACK(OnButtonReleaseEventThunk), this);
   g_signal_connect(event_box_, "enter-notify-event",
                    G_CALLBACK(OnEnterNotifyEventThunk), this);
   g_signal_connect(event_box_, "leave-notify-event",
                    G_CALLBACK(OnLeaveNotifyEventThunk), this);
   gtk_widget_add_events(event_box_,
         GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK |
@@ skipping 13 matching lines @@
 
   if (menu_controller_.get()) {
     // The menu is showing. Close the menu.
     menu_controller_->Cancel();
 
     // Invoke this so that we hide the highlight.
     ContextMenuClosed();
   }
 }
 
-void TabGtk::Raise() const {
-  GdkWindow* window = gtk_input_event_box_get_window(
-      GTK_INPUT_EVENT_BOX(event_box_));
-  gdk_window_raise(window);
-}
-
 gboolean TabGtk::OnButtonPressEvent(GtkWidget* widget, GdkEventButton* event) {
   // Every button press ensures either a button-release-event or a drag-fail
   // signal for |widget|.
   if (event->button == 1 && event->type == GDK_BUTTON_PRESS) {
     // Store whether or not we were selected just now... we only want to be
     // able to drag foreground tabs, so we don't start dragging the tab if
     // it was in the background.
     if (!IsActive()) {
       if (event->state & GDK_CONTROL_MASK)
         delegate_->ToggleTabSelection(this);
@@ skipping 140 matching lines @@
 void TabGtk::UpdateData(TabContents* contents, bool app, bool loading_only) {
   TabRendererGtk::UpdateData(contents, app, loading_only);
   // Cache the title width so we don't recalculate it every time the tab is
   // resized.
   title_width_ = GetTitleWidth(title_font(), GetTitle());
   UpdateTooltipState();
 }
 
 void TabGtk::SetBounds(const gfx::Rect& bounds) {
   TabRendererGtk::SetBounds(bounds);
-
-  if (gtk_input_event_box_get_window(GTK_INPUT_EVENT_BOX(event_box_))) {
-    gfx::Path mask;
-    TabResources::GetHitTestMask(bounds.width(), bounds.height(), &mask);
-    ui::ScopedRegion region(mask.CreateNativeRegion());
-    gdk_window_input_shape_combine_region(
-        gtk_input_event_box_get_window(GTK_INPUT_EVENT_BOX(event_box_)),
-        region.Get(),
-        0, 0);
-  }
-
   UpdateTooltipState();
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // TabGtk, private:
 
 void TabGtk::ContextMenuClosed() {
   delegate()->StopAllHighlighting();
   menu_controller_.reset();
 }
@@ skipping 52 matching lines @@
     gdk_event_free(last_mouse_down_);
     last_mouse_down_ = NULL;
   }
 
   // Notify the drag helper that we're done with any potential drag operations.
   // Clean up the drag helper, which is re-created on the next mouse press.
   delegate_->EndDrag(canceled);
 
   observer_.reset();
 }