diff options
author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-26 18:44:09 +0800 |
---|---|---|
committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-12-26 18:44:09 +0800 |
commit | 326566814a959f1827aca45f45e40d1f8f6b95e0 (patch) | |
tree | 689b6f19a0a6a7c9b7f723ae5966421c48918587 /www/webkit-gtk3/files | |
parent | 616ffb9cb141647c86d05a4bf591383f12cc0e57 (diff) | |
download | marcuscom-ports-326566814a959f1827aca45f45e40d1f8f6b95e0.tar marcuscom-ports-326566814a959f1827aca45f45e40d1f8f6b95e0.tar.gz marcuscom-ports-326566814a959f1827aca45f45e40d1f8f6b95e0.tar.bz2 marcuscom-ports-326566814a959f1827aca45f45e40d1f8f6b95e0.tar.lz marcuscom-ports-326566814a959f1827aca45f45e40d1f8f6b95e0.tar.xz marcuscom-ports-326566814a959f1827aca45f45e40d1f8f6b95e0.tar.zst marcuscom-ports-326566814a959f1827aca45f45e40d1f8f6b95e0.zip |
Update to 1.3.9.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14949 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'www/webkit-gtk3/files')
5 files changed, 0 insertions, 97 deletions
diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_graphics_GraphicsContext.h b/www/webkit-gtk3/files/patch-WebCore_platform_graphics_GraphicsContext.h deleted file mode 100644 index 0f8bd55c6..000000000 --- a/www/webkit-gtk3/files/patch-WebCore_platform_graphics_GraphicsContext.h +++ /dev/null @@ -1,20 +0,0 @@ ---- WebCore/platform/graphics/GraphicsContext.h.orig 2010-12-16 21:46:30.000000000 +0000 -+++ WebCore/platform/graphics/GraphicsContext.h 2010-12-16 22:05:45.000000000 +0000 -@@ -90,7 +90,7 @@ typedef void PlatformGraphicsContext; - #endif - - #if PLATFORM(GTK) --typedef struct _GdkDrawable GdkDrawable; -+typedef struct _GdkWindow GdkWindow; - typedef struct _GdkEventExpose GdkEventExpose; - #endif - -@@ -405,7 +405,7 @@ namespace WebCore { - - #if PLATFORM(GTK) - void setGdkExposeEvent(GdkEventExpose*); -- GdkDrawable* gdkDrawable() const; -+ GdkWindow* gdkWindow() const; - GdkEventExpose* gdkExposeEvent() const; - #endif - diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_graphics_cairo_GrahpicsContextCairo.cpp b/www/webkit-gtk3/files/patch-WebCore_platform_graphics_cairo_GrahpicsContextCairo.cpp deleted file mode 100644 index 77ad80825..000000000 --- a/www/webkit-gtk3/files/patch-WebCore_platform_graphics_cairo_GrahpicsContextCairo.cpp +++ /dev/null @@ -1,17 +0,0 @@ ---- WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp.orig 2010-12-16 21:44:44.000000000 +0000 -+++ WebCore/platform/graphics/cairo/GraphicsContextCairo.cpp 2010-12-16 21:45:54.000000000 +0000 -@@ -1121,12 +1121,12 @@ GdkEventExpose* GraphicsContext::gdkExpo - return m_data->expose; - } - --GdkDrawable* GraphicsContext::gdkDrawable() const -+GdkWindow* GraphicsContext::gdkWindow() const - { - if (!m_data->expose) - return 0; - -- return GDK_DRAWABLE(m_data->expose->window); -+ return m_data->expose->window; - } - #endif - diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PlatformScreenGtk.cpp b/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PlatformScreenGtk.cpp deleted file mode 100644 index e6956f59b..000000000 --- a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_PlatformScreenGtk.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- WebCore/platform/gtk/PlatformScreenGtk.cpp.orig 2010-12-16 23:22:44.000000000 +0000 -+++ WebCore/platform/gtk/PlatformScreenGtk.cpp 2010-12-16 23:33:34.000000000 +0000 -@@ -121,7 +121,7 @@ FloatRect screenAvailableRect(Widget* wi - if (!gtk_widget_get_realized(container)) - return screenRect(widget); - -- GdkDrawable* rootWindow = GDK_DRAWABLE(gtk_widget_get_root_window(container)); -+ GdkWindow* rootWindow = gtk_widget_get_root_window(container); - GdkDisplay* display = gdk_window_get_display(rootWindow); - Atom xproperty = gdk_x11_get_xatom_by_name_for_display(display, "_NET_WORKAREA"); - -@@ -130,7 +130,7 @@ FloatRect screenAvailableRect(Widget* wi - long *workAreaPos = NULL; - unsigned long retNItems; - unsigned long retAfter; -- int xRes = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(display), GDK_WINDOW_XWINDOW(rootWindow), xproperty, -+ int xRes = XGetWindowProperty(GDK_DISPLAY_XDISPLAY(display), GDK_WINDOW_XID(rootWindow), xproperty, - 0, 4, FALSE, XA_CARDINAL, &retType, &retFormat, &retNItems, &retAfter, (guchar**)&workAreaPos); - - FloatRect rect; diff --git a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_WidgetGtk.cpp b/www/webkit-gtk3/files/patch-WebCore_platform_gtk_WidgetGtk.cpp deleted file mode 100644 index 5f5f8cdaf..000000000 --- a/www/webkit-gtk3/files/patch-WebCore_platform_gtk_WidgetGtk.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- WebCore/platform/gtk/WidgetGtk.cpp.orig 2010-12-16 23:35:42.000000000 +0000 -+++ WebCore/platform/gtk/WidgetGtk.cpp 2010-12-16 23:36:29.000000000 +0000 -@@ -60,7 +60,7 @@ void Widget::setFocus(bool focused) - gtk_widget_grab_focus(platformWidget() ? platformWidget() : GTK_WIDGET(root()->hostWindow()->platformPageClient())); - } - --static GdkDrawable* gdkDrawable(PlatformWidget widget) -+static GdkWindow* gdkWindow(PlatformWidget widget) - { - return widget ? gtk_widget_get_window(widget) : 0; - } -@@ -78,7 +78,7 @@ void Widget::setCursor(const Cursor& cur - if (platformCursor == lastSetCursor) - return; - -- gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor); -+ gdk_window_set_cursor(gdkWindow(platformWidget()) ? GDK_WINDOW(platformWidget()) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor); - lastSetCursor = platformCursor; - } - diff --git a/www/webkit-gtk3/files/patch-WebCore_plugins_gtk_gtk2xtbin.c b/www/webkit-gtk3/files/patch-WebCore_plugins_gtk_gtk2xtbin.c deleted file mode 100644 index c278e2a88..000000000 --- a/www/webkit-gtk3/files/patch-WebCore_plugins_gtk_gtk2xtbin.c +++ /dev/null @@ -1,20 +0,0 @@ ---- WebCore/plugins/gtk/gtk2xtbin.c.orig 2010-12-16 23:40:35.000000000 +0000 -+++ WebCore/plugins/gtk/gtk2xtbin.c 2010-12-16 23:45:40.000000000 +0000 -@@ -285,7 +285,7 @@ gtk_xtbin_realize (GtkWidget *widget) - xtbin = GTK_XTBIN (widget); - - /* caculate the allocation before realize */ -- gdk_window_get_geometry(xtbin->parent_window, &x, &y, &w, &h, &d); -+ gdk_window_get_geometry(xtbin->parent_window, &x, &y, &w, &h); - allocation.width = w; - allocation.height = h; - gtk_widget_size_allocate (widget, &allocation); -@@ -346,7 +346,7 @@ gtk_xtbin_new (GtkWidget *parent_widget, - screen = gtk_widget_get_screen(parent_widget); - visual = gdk_screen_get_system_visual(screen); - colormap = XCreateColormap(GDK_DISPLAY_XDISPLAY(gdk_screen_get_display(screen)), -- GDK_WINDOW_XWINDOW(gdk_screen_get_root_window(screen)), -+ GDK_WINDOW_XID(gdk_screen_get_root_window(screen)), - GDK_VISUAL_XVISUAL(visual), AllocNone); - - xt_client_init(&(xtbin->xtclient), |