Changeset 60785 in webkit


Ignore:
Timestamp:
Jun 7, 2010 8:02:47 AM (14 years ago)
Author:
Martin Robinson
Message:

2010-06-07 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] gtk_widget_get_window should replace widget->window
​https://bugs.webkit.org/show_bug.cgi?id=40180

Replace all uses of widget->window with gtk_widget_get_window. For older
GTK+ versions, #define gtk_widget_get_window in GtkVersioning.h.

No tests necessary as functionality has not changed.

  • platform/gtk/GtkPluginWidget.cpp: (WebCore::GtkPluginWidget::invalidateRect): Replace widget->window use.
  • platform/gtk/GtkVersioning.h: Add gtk_widget_get_window for old GTK+ versions.
  • platform/gtk/PlatformScreenGtk.cpp: (WebCore::getVisual): Replace widget->window use. (WebCore::screenRect): Ditto.
  • platform/gtk/PopupMenuGtk.cpp: (WebCore::PopupMenu::show): Ditto.
  • platform/gtk/WidgetGtk.cpp: (WebCore::gdkDrawable): Ditto. (WebCore::Widget::setCursor): Ditto.

2010-06-07 Martin Robinson <​mrobinson@igalia.com>

Reviewed by Xan Lopez.

[GTK] gtk_widget_get_window should replace widget->window
​https://bugs.webkit.org/show_bug.cgi?id=40180

Replace uses of widget->window with gtk_widget_get_window.

  • WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::invalidateContentsAndWindow): Replace widget->window uses. (WebKit::ChromeClient::scroll): Ditto. (WebKit::widgetScreenPosition): Ditto.
  • WebCoreSupport/DragClientGtk.cpp: Move gtk_widget_get_window define to GtkVersioning.h.
  • webkit/webkitwebview.cpp: (webkit_web_view_popup_menu_handler): Replace widget->window uses. (webkit_web_view_button_press_event): Ditto.
Location:
trunk
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • trunk/WebCore/ChangeLog

    r60784 r60785  
     12010-06-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] gtk_widget_get_window should replace widget->window
     6        https://bugs.webkit.org/show_bug.cgi?id=40180
     7
     8        Replace all uses of widget->window with gtk_widget_get_window. For older
     9        GTK+ versions, #define gtk_widget_get_window in GtkVersioning.h.
     10
     11        No tests necessary as functionality has not changed.
     12
     13        * platform/gtk/GtkPluginWidget.cpp:
     14        (WebCore::GtkPluginWidget::invalidateRect): Replace widget->window use.
     15        * platform/gtk/GtkVersioning.h: Add gtk_widget_get_window for old GTK+ versions.
     16        * platform/gtk/PlatformScreenGtk.cpp:
     17        (WebCore::getVisual): Replace widget->window use.
     18        (WebCore::screenRect): Ditto.
     19        * platform/gtk/PopupMenuGtk.cpp:
     20        (WebCore::PopupMenu::show): Ditto.
     21        * platform/gtk/WidgetGtk.cpp:
     22        (WebCore::gdkDrawable): Ditto.
     23        (WebCore::Widget::setCursor): Ditto.
     24
    1252010-06-07  Nikolas Zimmermann  <nzimmermann@rim.com>
    226

  • trunk/WebCore/platform/gtk/GtkPluginWidget.cpp

    r56387 r60785  
    4848        return;
    4949
    50     GdkWindow* window = platformWidget()->window;
     50    GdkWindow* window = gtk_widget_get_window(platformWidget());
    5151    if (!window)
    5252        return;

  • trunk/WebCore/platform/gtk/GtkVersioning.h

    r56387 r60785  
    3232#endif // GTK_CHECK_VERSION(2, 19, 0)
    3333
     34#if !GTK_CHECK_VERSION(2, 14, 0)
     35#define gtk_widget_get_window(widget) (widget)->window
     36#endif
     37
    3438#endif // GtkVersioning_h

  • trunk/WebCore/platform/gtk/PlatformScreenGtk.cpp

    r56387 r60785  
    6565
    6666
    67     return gdk_drawable_get_visual(GDK_DRAWABLE(container->window));
     67    return gdk_drawable_get_visual(GDK_DRAWABLE(gtk_widget_get_window(container)));
    6868}
    6969
    … …  
    103103        return FloatRect();
    104104
    105     gint monitor = gdk_screen_get_monitor_at_window(screen, GTK_WIDGET(container)->window);
     105    gint monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(GTK_WIDGET(container)));
    106106    GdkRectangle geometry;
    107107    gdk_screen_get_monitor_geometry(screen, monitor, &geometry);

  • trunk/WebCore/platform/gtk/PopupMenuGtk.cpp

    r56825 r60785  
    2727
    2828#include "FrameView.h"
     29#include "GtkVersioning.h"
    2930#include "HostWindow.h"
    3031#include "PlatformString.h"
    … …  
    5859
    5960    int x, y;
    60     gdk_window_get_origin(GTK_WIDGET(view->hostWindow()->platformPageClient())->window, &x, &y);
     61    gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(view->hostWindow()->platformPageClient())), &x, &y);
    6162    m_menuPosition = view->contentsToWindow(rect.location());
    6263    m_menuPosition = IntPoint(m_menuPosition.x() + x, m_menuPosition.y() + y + rect.height());

  • trunk/WebCore/platform/gtk/WidgetGtk.cpp

    r58821 r60785  
    6262static GdkDrawable* gdkDrawable(PlatformWidget widget)
    6363{
    64     return widget ? widget->window : 0;
     64    return widget ? gtk_widget_get_window(widget) : 0;
    6565}
    6666   
    … …  
    7878        return;
    7979
    80     gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : GTK_WIDGET(root()->hostWindow()->platformPageClient())->window, platformCursor);
     80    gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor);
    8181    lastSetCursor = platformCursor;
    8282}

  • trunk/WebKit/gtk/ChangeLog

    r60709 r60785  
     12010-06-07  Martin Robinson  <mrobinson@igalia.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] gtk_widget_get_window should replace widget->window
     6        https://bugs.webkit.org/show_bug.cgi?id=40180
     7
     8        Replace uses of widget->window with gtk_widget_get_window.
     9
     10        * WebCoreSupport/ChromeClientGtk.cpp:
     11        (WebKit::ChromeClient::invalidateContentsAndWindow): Replace widget->window uses.
     12        (WebKit::ChromeClient::scroll): Ditto.
     13        (WebKit::widgetScreenPosition): Ditto.
     14        * WebCoreSupport/DragClientGtk.cpp: Move gtk_widget_get_window define to GtkVersioning.h.
     15        * webkit/webkitwebview.cpp:
     16        (webkit_web_view_popup_menu_handler): Replace widget->window uses.
     17        (webkit_web_view_button_press_event): Ditto.
     18
    1192010-06-04  Martin Robinson  <mrobinson@igalia.com>
    220

  • trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

    r57903 r60785  
    337337{
    338338    GdkRectangle rect = updateRect;
    339     GdkWindow* window = GTK_WIDGET(m_webView)->window;
     339    GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(m_webView));
    340340
    341341    if (window) {
    … …  
    354354void ChromeClient::scroll(const IntSize& delta, const IntRect& rectToScroll, const IntRect& clipRect)
    355355{
    356     GdkWindow* window = GTK_WIDGET(m_webView)->window;
     356    GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(m_webView));
    357357    if (!window)
    358358        return;
    … …  
    392392    IntPoint result(widgetX, widgetY);
    393393    int originX, originY;
    394     gdk_window_get_origin(window->window, &originX, &originY);
     394    gdk_window_get_origin(gtk_widget_get_window(window), &originX, &originY);
    395395    result.move(originX, originY);
    396396

  • trunk/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp

    r60709 r60785  
    2929#include "GOwnPtrGtk.h"
    3030#include "GRefPtrGtk.h"
     31#include "GtkVersioning.h"
    3132#include "NotImplemented.h"
    3233#include "PasteboardHelper.h"
    … …  
    3435#include "webkitprivate.h"
    3536#include "webkitwebview.h"
    36 
    3737#include <gtk/gtk.h>
    38 #if !GTK_CHECK_VERSION(2, 14, 0)
    39 #define gtk_widget_get_window(widget) (widget)->window
    40 #endif
    4138
    4239using namespace WebCore;

  • trunk/WebKit/gtk/webkit/webkitwebview.cpp

    r60491 r60785  
    372372
    373373    int x, y;
    374     gdk_window_get_origin(GTK_WIDGET(view->hostWindow()->platformPageClient())->window, &x, &y);
     374    gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(view->hostWindow()->platformPageClient())), &x, &y);
    375375
    376376    // FIXME: The IntSize(0, -1) is a hack to get the hit-testing to result in the selected element.
    … …  
    613613    gint doubleClickDistance = 250;
    614614    gint doubleClickTime = 5;
    615     GtkSettings* settings = gtk_settings_get_for_screen(gdk_drawable_get_screen(widget->window));
     615    GtkSettings* settings = gtk_settings_get_for_screen(gdk_drawable_get_screen(gtk_widget_get_window(widget)));
    616616    g_object_get(settings,
    617617        "gtk-double-click-distance", &doubleClickDistance,
Note: See TracChangeset for help on using the changeset viewer.