Changeset 75397 in webkit


Ignore:
Timestamp:
Jan 10, 2011 11:29:39 AM (13 years ago)
Author:
alex
Message:

2011-01-10 Alejandro G. Castro <​alex@igalia.com>

Reviewed by Xan Lopez.

[GTK] Fix gtk2 compilation for master
​https://bugs.webkit.org/show_bug.cgi?id=51885

  • platform/gtk/GtkVersioning.h: Replaced the 2.24.0 check with 2.23.0 to avoid using the old symbols in the 2.23 releases. Added support for gdk_pixmap_get_size before the 2.23.4.
  • platform/gtk/WidgetRenderingContextGtk2.cpp: (WebCore::WidgetRenderingContext::WidgetRenderingContext): Replaced the old gdk_drawable_get_size with gdk_pixmap_get_size.

2011-01-10 Alejandro G. Castro <​alex@igalia.com>

Reviewed by Xan Lopez.

[GTK] Fix gtk2 compilation for master
​https://bugs.webkit.org/show_bug.cgi?id=51885

  • DumpRenderTree/gtk/PixelDumpSupportGtk.cpp: (createBitmapContextFromWebView): Replaced the old gdk_drawable_get_size with gdk_pixmap_get_size.

2011-01-10 Alejandro G. Castro <​alex@igalia.com>

Reviewed by Xan Lopez.

[GTK] Fix gtk2 compilation for master
​https://bugs.webkit.org/show_bug.cgi?id=51885

  • webkit/webkitsoupauthdialog.c: (show_auth_dialog): Removed the call to gtk_dialog_set_has_separator API to remove a warning.
Location:
trunk
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r75394 r75397  
     12011-01-10  Alejandro G. Castro  <alex@igalia.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] Fix gtk2 compilation for master
     6        https://bugs.webkit.org/show_bug.cgi?id=51885
     7
     8        * platform/gtk/GtkVersioning.h: Replaced the 2.24.0 check with
     9        2.23.0 to avoid using the old symbols in the 2.23 releases. Added
     10        support for gdk_pixmap_get_size before the 2.23.4.
     11        * platform/gtk/WidgetRenderingContextGtk2.cpp:
     12        (WebCore::WidgetRenderingContext::WidgetRenderingContext):
     13        Replaced the old gdk_drawable_get_size with gdk_pixmap_get_size.
     14
    1152011-01-10  Ryosuke Niwa  <rniwa@webkit.org>
    216

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

    r74496 r75397  
    3838#endif
    3939
    40 #if !GTK_CHECK_VERSION(2, 24, 0)
     40#if !GTK_CHECK_VERSION(2, 23, 4)
     41#define gdk_pixmap_get_size gdk_drawable_get_size
     42#endif // GTK_CHECK_VERSION(2, 23, 4)
     43
     44#if !GTK_CHECK_VERSION(2, 23, 0)
    4145#define gdk_window_get_display(window) gdk_drawable_get_display(window)
    42 #ifdef GDK_DISABLE_DEPRECATED
    4346#define gdk_window_get_visual gdk_drawable_get_visual
    44 #endif
    45 #endif // GTK_CHECK_VERSION(2, 24, 0)
     47#endif // GTK_CHECK_VERSION(2, 23, 0)
    4648
    4749#if !GTK_CHECK_VERSION(2, 21, 2)

  • trunk/Source/WebCore/platform/gtk/WidgetRenderingContextGtk2.cpp

    r74129 r75397  
    3333
    3434#include "GraphicsContext.h"
     35#include "GtkVersioning.h"
    3536#include "RefPtrCairo.h"
    3637#include "RenderThemeGtk.h"
    … …  
    108109    int scratchHeight = 0;
    109110    if (gScratchBuffer)
    110         gdk_drawable_get_size(gScratchBuffer, &scratchWidth, &scratchHeight);
     111        gdk_pixmap_get_size(gScratchBuffer, &scratchWidth, &scratchHeight);
    111112
    112113    // We do not need to recreate the buffer if the current buffer is large enough.

  • trunk/Tools/ChangeLog

    r75396 r75397  
     12011-01-10  Alejandro G. Castro  <alex@igalia.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] Fix gtk2 compilation for master
     6        https://bugs.webkit.org/show_bug.cgi?id=51885
     7
     8        * DumpRenderTree/gtk/PixelDumpSupportGtk.cpp:
     9        (createBitmapContextFromWebView): Replaced the old
     10        gdk_drawable_get_size with gdk_pixmap_get_size.
     11
    1122011-01-10  Patrick Gansterer  <paroga@webkit.org>
    213

  • trunk/Tools/DumpRenderTree/gtk/PixelDumpSupportGtk.cpp

    r69294 r75397  
    3131
    3232#include "DumpRenderTree.h"
     33#include "GtkVersioning.h"
    3334#include "PixelDumpSupportCairo.h"
    3435#include <webkit/webkit.h>
    … …  
    4041#ifdef GTK_API_VERSION_2
    4142    GdkPixmap* pixmap = gtk_widget_get_snapshot(GTK_WIDGET(view), 0);
    42     gdk_drawable_get_size(GDK_DRAWABLE(pixmap), &width, &height);
     43    gdk_pixmap_get_size(pixmap, &width, &height);
    4344#else
    4445    width = gtk_widget_get_allocated_width(GTK_WIDGET(view));

  • trunk/WebKit/gtk/ChangeLog

    r75362 r75397  
     12011-01-10  Alejandro G. Castro  <alex@igalia.com>
     2
     3        Reviewed by Xan Lopez.
     4
     5        [GTK] Fix gtk2 compilation for master
     6        https://bugs.webkit.org/show_bug.cgi?id=51885
     7
     8        * webkit/webkitsoupauthdialog.c:
     9        (show_auth_dialog): Removed the call to
     10        gtk_dialog_set_has_separator API to remove a warning.
     11
    1122011-01-10  Xan Lopez  <xlopez@igalia.com>
    213

  • trunk/WebKit/gtk/webkit/webkitsoupauthdialog.c

    r69655 r75397  
    227227
    228228    /* Set the dialog up with HIG properties */
    229 #ifdef GTK_API_VERSION_2
    230     gtk_dialog_set_has_separator(dialog, FALSE);
    231 #endif
    232229    gtk_container_set_border_width(GTK_CONTAINER(dialog), 5);
    233230    gtk_box_set_spacing(GTK_BOX(gtk_dialog_get_content_area(dialog)), 2); /* 2 * 5 + 2 = 12 */
Note: See TracChangeset for help on using the changeset viewer.