WebKit merge 41447:41498 [third_party/WebKit]

third_party/WebKit/WebCore/platform/gtk/WidgetGtk.cpp

 /*
  * Copyright (C) 2006 Michael Emmel mike.emmel@gmail.com
  * Copyright (C) 2007 Holger Hans Peter Freyther
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
@@ skipping 77 matching lines @@
     gtk_widget_show(platformWidget());
 }
 
 void Widget::hide()
 {
     if (!platformWidget())
          return;
     gtk_widget_hide(platformWidget());
 }
 
-/*
- * Strategy to painting a Widget:
- *  1.) do not paint if there is no GtkWidget set
- *  2.) We assume that GTK_NO_WINDOW is set and that frameRectsChanged positioned
- *      the widget correctly. ATM we do not honor the GraphicsContext translation.
- */
-void Widget::paint(GraphicsContext* context, const IntRect&)
+void Widget::paint(GraphicsContext* context, const IntRect& rect)
 {
-    if (!platformWidget())
-        return;
-
-    if (!context->gdkExposeEvent())
-        return;
-
-    GtkWidget* widget = platformWidget();
-    ASSERT(GTK_WIDGET_NO_WINDOW(widget));
-
-    GdkEvent* event = gdk_event_new(GDK_EXPOSE);
-    event->expose = *context->gdkExposeEvent();
-    event->expose.region = gtk_widget_region_intersect(widget, event->expose.region);
-
-    /*
-     * This will be unref'ed by gdk_event_free.
-     */
-    g_object_ref(event->expose.window);
-
-    /*
-     * If we are going to paint do the translation and GtkAllocation manipulation.
-     */
-    if (!gdk_region_empty(event->expose.region)) {
-        gdk_region_get_clipbox(event->expose.region, &event->expose.area);
-        gtk_widget_send_expose(widget, event);
-    }
-
-    gdk_event_free(event);
 }
 
 void Widget::setIsSelected(bool)
 {
     notImplemented();
 }
 
 IntRect Widget::frameRect() const
 {
     return m_frame;
@@ skipping 12 matching lines @@
 }
 
 void Widget::retainPlatformWidget()
 {
     if (!platformWidget())
          return;
     g_object_ref_sink(platformWidget());
 }
 
 }