Revert 116956 - GTK: Seal up GSEALs, focusing on GtkSelectionData.

chrome/browser/ui/gtk/bubble/bubble_gtk.cc

-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
+// 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/bubble/bubble_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "chrome/browser/ui/gtk/bubble/bubble_accelerators_gtk.h"
 #include "chrome/browser/ui/gtk/gtk_theme_service.h"
@@ skipping 288 matching lines @@
     mask_region_ = NULL;
   }
   GtkAllocation allocation;
   gtk_widget_get_allocation(window_, &allocation);
   std::vector<GdkPoint> points = MakeFramePolygonPoints(
       current_arrow_location_, allocation.width, allocation.height,
       FRAME_MASK);
   mask_region_ = gdk_region_polygon(&points[0],
                                     points.size(),
                                     GDK_EVEN_ODD_RULE);
-
-  GdkWindow* gdk_window = gtk_widget_get_window(window_);
-  gdk_window_shape_combine_region(gdk_window, NULL, 0, 0);
-  gdk_window_shape_combine_region(gdk_window, mask_region_, 0, 0);
+  gdk_window_shape_combine_region(window_->window, NULL, 0, 0);
+  gdk_window_shape_combine_region(window_->window, mask_region_, 0, 0);
 }
 
 void BubbleGtk::MoveWindow() {
   if (!toplevel_window_ || !anchor_widget_)
     return;
 
   gint toplevel_x = 0, toplevel_y = 0;
   gdk_window_get_position(gtk_widget_get_window(toplevel_window_),
                           &toplevel_x, &toplevel_y);
 
@@ skipping 44 matching lines @@
 
 void BubbleGtk::Close() {
   // We don't need to ungrab the pointer or keyboard here; the X server will
   // automatically do that when we destroy our window.
   DCHECK(window_);
   gtk_widget_destroy(window_);
   // |this| has been deleted, see OnDestroy.
 }
 
 void BubbleGtk::GrabPointerAndKeyboard() {
-  GdkWindow* gdk_window = gtk_widget_get_window(window_);
-
   // Install X pointer and keyboard grabs to make sure that we have the focus
   // and get all mouse and keyboard events until we're closed.
   GdkGrabStatus pointer_grab_status =
-      gdk_pointer_grab(gdk_window,
+      gdk_pointer_grab(window_->window,
                        TRUE,                   // owner_events
                        GDK_BUTTON_PRESS_MASK,  // event_mask
                        NULL,                   // confine_to
                        NULL,                   // cursor
                        GDK_CURRENT_TIME);
   if (pointer_grab_status != GDK_GRAB_SUCCESS) {
     // This will fail if someone else already has the pointer grabbed, but
     // there's not really anything we can do about that.
     DLOG(ERROR) << "Unable to grab pointer (status="
                 << pointer_grab_status << ")";
   }
   GdkGrabStatus keyboard_grab_status =
-      gdk_keyboard_grab(gdk_window,
+      gdk_keyboard_grab(window_->window,
                         FALSE,  // owner_events
                         GDK_CURRENT_TIME);
   if (keyboard_grab_status != GDK_GRAB_SUCCESS) {
     DLOG(ERROR) << "Unable to grab keyboard (status="
                 << keyboard_grab_status << ")";
   }
 }
 
 gboolean BubbleGtk::OnGtkAccelerator(GtkAccelGroup* group,
                                      GObject* acceleratable,
@@ skipping 46 matching lines @@
       }
       break;
     default:
       return FALSE;
   }
 
   return TRUE;
 }
 
 gboolean BubbleGtk::OnExpose(GtkWidget* widget, GdkEventExpose* expose) {
-  // TODO(erg): This whole method will need to be rewritten in cairo.
   GdkDrawable* drawable = GDK_DRAWABLE(window_->window);
   GdkGC* gc = gdk_gc_new(drawable);
   gdk_gc_set_rgb_fg_color(gc, &kFrameColor);
 
   // Stroke the frame border.
   GtkAllocation allocation;
   gtk_widget_get_allocation(window_, &allocation);
   std::vector<GdkPoint> points = MakeFramePolygonPoints(
       current_arrow_location_, allocation.width, allocation.height,
       FRAME_STROKE);
@@ skipping 63 matching lines @@
 gboolean BubbleGtk::OnToplevelUnmap(GtkWidget* widget, GdkEvent* event) {
   Close();
   return FALSE;
 }
 
 void BubbleGtk::OnAnchorAllocate(GtkWidget* widget,
                                  GtkAllocation* allocation) {
   if (!UpdateArrowLocation(false))
     MoveWindow();
 }