More interactive test porting for Linux.

chrome/common/gtk_util.cc

 // Copyright (c) 2009 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/common/gtk_util.h"
 
 #include <gtk/gtk.h>
 #include <gdk/gdkx.h>
 
 #include <cstdarg>
@@ skipping 130 matching lines @@
   GtkStyle* style = widget->style;
   PangoFontDescription* font_desc = style->font_desc;
   // pango_font_description_set_absolute_size sets the font size in device
   // units, which for us is pixels.
   pango_font_description_set_absolute_size(font_desc,
                                            PANGO_SCALE * size_pixels);
   gtk_widget_modify_font(widget, font_desc);
 }
 
 gfx::Point GetWidgetScreenPosition(GtkWidget* widget) {
-  int x = 0, y = 0;
+  gint x, y;
+  gdk_window_get_origin(widget->window, &x, &y);

[tony, 2009/08/21 21:13:39]

x & y still get filled in if there's no window? I thought we depend on the
parent traversal for getting the position of hidden widgets or something (e.g.,
do dragged tabs still look ok?)

[Evan Stade, 2009/08/21 21:43:42]

uh, there should always be a window, right? If the widget isn't realized then I
don't think getting the position makes sense. Walking the widget's ancestors is
unnecessary because  the allocation x/y coords are GdkWindow-relative for
no-window widgets (whereas they are parent-widget relative for windowed
widgets).

I've tested tab dragging with and without this patch, and can't notice a
difference. (Although it is noteworthy that in both cases, there are glaring
graphical and functional glitches.)

[tony, 2009/08/21 21:48:51]

If there's always a gdk window, can we add a DCHECK as such?  With that, LGTM.

 
-  if (GTK_IS_WINDOW(widget)) {
-    gdk_window_get_origin(widget->window, &x, &y);
-    return gfx::Point(x, y);
-  } else {
-    x = widget->allocation.x;
-    y = widget->allocation.y;
-  }
-
-  GtkWidget* parent = gtk_widget_get_parent(widget);
-  while (parent) {
-    if (GTK_IS_WINDOW(parent)) {
-      int window_x, window_y;
-      // Returns the origin of the window, excluding the frame if one is exists.
-      gdk_window_get_origin(parent->window, &window_x, &window_y);
-      x += window_x;
-      y += window_y;
-      return gfx::Point(x, y);
-    }
-
-    if (!GTK_WIDGET_NO_WINDOW(parent)) {
-      x += parent->allocation.x;
-      y += parent->allocation.y;
-    }
-
-    parent = gtk_widget_get_parent(parent);
+  if (!GTK_IS_WINDOW(widget)) {
+    x += widget->allocation.x;
+    y += widget->allocation.y;
   }
 
   return gfx::Point(x, y);
 }
 
 gfx::Rect GetWidgetScreenBounds(GtkWidget* widget) {
   gfx::Point position = GetWidgetScreenPosition(widget);
   return gfx::Rect(position.x(), position.y(),
                    widget->allocation.width, widget->allocation.height);
 }
@@ skipping 239 matching lines @@
   gtk_widget_get_pointer(widget, &x, &y);
   return gfx::Point(x, y);
 }
 
 GdkPoint MakeBidiGdkPoint(gint x, gint y, gint width, bool ltr) {
   GdkPoint point = {ltr ? x : width - x, y};
   return point;
 }
 
 }  // namespace gtk_util