linux: make windowless plugins work again after r12179 regressed it.

webkit/tools/test_shell/test_webview_delegate_gtk.cc

 // Copyright (c) 2008 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.
 
 // This file was forked off the Mac port.
 
 #include "webkit/tools/test_shell/test_webview_delegate.h"
 
 #include <gtk/gtk.h>
 
@@ skipping 214 matching lines @@
 
   // Update the clipping region on the GdkWindow.
   GdkRectangle clip_rect = move.clip_rect.ToGdkRectangle();
   GdkRegion* clip_region = gdk_region_rectangle(&clip_rect);
   gfx::SubtractRectanglesFromRegion(clip_region, move.cutout_rects);
   gdk_window_shape_combine_region(widget->window, clip_region, 0, 0);
   gdk_region_destroy(clip_region);
 
   // Update the window position.  Resizing is handled by WebPluginDelegate.
   // TODO(deanm): Verify that we only need to move and not resize.
-  // TODO(deanm): Can we avoid the X call if it's already at the right place,
-  // the GtkFixed knows where the child is, maybe it handles this for us?
+  // TODO(evanm): we should cache the last shape and position and skip all
+  // of this business in the common case where nothing has changed.
   WebWidgetHost* host = GetHostForWidget(webwidget);
-  gtk_fixed_move(GTK_FIXED(host->view_handle()),
-                 widget,
-                 move.window_rect.x(),
-                 move.window_rect.y());
+  int current_x, current_y;
+
+  // Until the above TODO is resolved, we can grab the last position
+  // off of the GtkFixed with a bit of hackery.
+  GValue value = {0};
+  g_value_init(&value, G_TYPE_INT);
+  gtk_container_child_get_property(GTK_CONTAINER(host->view_handle()), widget,
+                                   "x", &value);
+  current_x = g_value_get_int(&value);
+  gtk_container_child_get_property(GTK_CONTAINER(host->view_handle()), widget,
+                                   "y", &value);
+  current_y = g_value_get_int(&value);
+  g_value_unset(&value);

[Dean McNamee, 2009/04/15 08:30:27]

I would have pulled this out, but it's ok.

[Evan Martin, 2009/04/15 16:03:38]

I was concerned about some data structure inside the GValue needing to be freed.
 Though it's likely just a tagged union.

[Dean McNamee, 2009/04/15 16:05:55]

I meant I would have made a helper.

fixed_pos(GtkFixed, int& x, int& y);

Whatev, LG.

On 2009/04/15 16:03:38, Evan Martin wrote:

+
+  if (move.window_rect.x() != current_x || move.window_rect.y() != current_y) {
+    // Calling gtk_fixed_move unnecessarily is a no-no, as it causes the parent
+    // window to repaint!
+    gtk_fixed_move(GTK_FIXED(host->view_handle()),
+                   widget,
+                   move.window_rect.x(),
+                   move.window_rect.y());
+  }
 }
 
 void TestWebViewDelegate::RunModal(WebWidget* webwidget) {
   NOTIMPLEMENTED();
 }
 
 void TestWebViewDelegate::UpdateSelectionClipboard(bool is_empty_selection) {
   if (is_empty_selection)
     return;
 
@@ skipping 17 matching lines @@
 // Private methods -----------------------------------------------------------
 
 void TestWebViewDelegate::SetPageTitle(const std::wstring& title) {
   gtk_window_set_title(GTK_WINDOW(shell_->mainWnd()),
                        ("Test Shell - " + WideToUTF8(title)).c_str());
 }
 
 void TestWebViewDelegate::SetAddressBarURL(const GURL& url) {
   gtk_entry_set_text(GTK_ENTRY(shell_->editWnd()), url.spec().c_str());
 }