Fix infinite paint loop on Linux.

webkit/tools/test_shell/webwidget_host_gtk.cc

 // Copyright (c) 2006-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.
 
 #include "webkit/tools/test_shell/webwidget_host.h"
 
 #include <cairo/cairo.h>
 #include <gtk/gtk.h>
 
 #include "base/logging.h"
 #include "base/gfx/platform_canvas_linux.h"
 #include "base/gfx/platform_device_linux.h"
 #include "base/gfx/bitmap_platform_device_linux.h"
 #include "webkit/glue/webinputevent.h"
 #include "webkit/glue/webwidget.h"
 
 namespace {
 
+bool handling_expose = false;
+
 // -----------------------------------------------------------------------------
 // Callback functions to proxy to host...
 
 gboolean ConfigureEvent(GtkWidget* widget, GdkEventConfigure* config,
                         WebWidgetHost* host) {
   host->Resize(gfx::Size(config->width, config->height));
   return FALSE;
 }
 
 gboolean ExposeEvent(GtkWidget* widget, GdkEventExpose* expose,
                      WebWidgetHost* host) {
+  handling_expose = true;
   gfx::Rect rect(expose->area);
   host->UpdatePaintRect(rect);
   host->Paint();
+  handling_expose = false;
   return FALSE;
 }
 
 gboolean DestroyEvent(GtkWidget* widget, GdkEvent* event,
                       WebWidgetHost* host) {
   host->WindowDestroyed();
   return FALSE;
 }
 
 gboolean KeyPressReleaseEvent(GtkWidget* widget, GdkEventKey* event,
@@ skipping 105 matching lines @@
 
 void WebWidgetHost::UpdatePaintRect(const gfx::Rect& rect) {
   paint_rect_ = paint_rect_.Union(rect);
 }
 
 void WebWidgetHost::DidInvalidateRect(const gfx::Rect& damaged_rect) {
   DLOG_IF(WARNING, painting_) << "unexpected invalidation while painting";
 
   UpdatePaintRect(damaged_rect);
 
-  gtk_widget_queue_draw_area(GTK_WIDGET(view_), damaged_rect.x(),
-      damaged_rect.y(), damaged_rect.width(), damaged_rect.height());
+  if (!handling_expose) {
+    gtk_widget_queue_draw_area(GTK_WIDGET(view_), damaged_rect.x(),
+        damaged_rect.y(), damaged_rect.width(), damaged_rect.height());
+  }
 }
 
 void WebWidgetHost::DidScrollRect(int dx, int dy, const gfx::Rect& clip_rect) {
   // This is used for optimizing painting when the renderer is scrolled. We're
   // currently not doing any optimizations so just invalidate the region.
   DidInvalidateRect(clip_rect);
 }
 
 WebWidgetHost* FromWindow(gfx::WindowHandle view) {
   const gpointer p = g_object_get_data(G_OBJECT(view), "webwidgethost");
@@ skipping 79 matching lines @@
 }
 
 // -----------------------------------------------------------------------------
 // This is called when the GTK window is destroyed. In the Windows code this
 // deletes this object. Since it's only test_shell it probably doesn't matter
 // that much.
 // -----------------------------------------------------------------------------
 void WebWidgetHost::WindowDestroyed() {
   delete this;
 }