[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.3-2-25-gb2c19be
Gustavo Noronha Silva
gns at gnome.org
Mon Sep 6 13:09:05 UTC 2010
The following commit has been merged in the debian/unstable branch:
commit d0a1dbb5bf03d72f52ad5bfaf40766db5120db21
Author: mrobinson at webkit.org <mrobinson at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jun 7 15:02:47 2010 +0000
2010-06-07 Martin Robinson <mrobinson at 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 at 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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@60785 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2338168..ae28068 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,27 @@
+2010-06-07 Martin Robinson <mrobinson at 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-10 Tony Chang <tony at chromium.org>
Reviewed by Kent Tamura.
diff --git a/WebCore/platform/gtk/GtkPluginWidget.cpp b/WebCore/platform/gtk/GtkPluginWidget.cpp
index 67bf4b1..94382f1 100644
--- a/WebCore/platform/gtk/GtkPluginWidget.cpp
+++ b/WebCore/platform/gtk/GtkPluginWidget.cpp
@@ -47,7 +47,7 @@ void GtkPluginWidget::invalidateRect(const IntRect& _rect)
if (!gtk_widget_get_has_window(platformWidget()))
return;
- GdkWindow* window = platformWidget()->window;
+ GdkWindow* window = gtk_widget_get_window(platformWidget());
if (!window)
return;
diff --git a/WebCore/platform/gtk/GtkVersioning.h b/WebCore/platform/gtk/GtkVersioning.h
index fc92d8b..cdd679c 100644
--- a/WebCore/platform/gtk/GtkVersioning.h
+++ b/WebCore/platform/gtk/GtkVersioning.h
@@ -31,4 +31,8 @@
#define gtk_widget_is_sensitive(widget) GTK_WIDGET_IS_SENSITIVE(widget)
#endif // GTK_CHECK_VERSION(2, 19, 0)
+#if !GTK_CHECK_VERSION(2, 14, 0)
+#define gtk_widget_get_window(widget) (widget)->window
+#endif
+
#endif // GtkVersioning_h
diff --git a/WebCore/platform/gtk/PlatformScreenGtk.cpp b/WebCore/platform/gtk/PlatformScreenGtk.cpp
index 9341714..0ab00a1 100644
--- a/WebCore/platform/gtk/PlatformScreenGtk.cpp
+++ b/WebCore/platform/gtk/PlatformScreenGtk.cpp
@@ -64,7 +64,7 @@ static GdkVisual* getVisual(Widget* widget)
}
- return gdk_drawable_get_visual(GDK_DRAWABLE(container->window));
+ return gdk_drawable_get_visual(GDK_DRAWABLE(gtk_widget_get_window(container)));
}
int screenDepth(Widget* widget)
@@ -102,7 +102,7 @@ FloatRect screenRect(Widget* widget)
if (!screen)
return FloatRect();
- gint monitor = gdk_screen_get_monitor_at_window(screen, GTK_WIDGET(container)->window);
+ gint monitor = gdk_screen_get_monitor_at_window(screen, gtk_widget_get_window(GTK_WIDGET(container)));
GdkRectangle geometry;
gdk_screen_get_monitor_geometry(screen, monitor, &geometry);
diff --git a/WebCore/platform/gtk/PopupMenuGtk.cpp b/WebCore/platform/gtk/PopupMenuGtk.cpp
index 0363ac4..865675f 100644
--- a/WebCore/platform/gtk/PopupMenuGtk.cpp
+++ b/WebCore/platform/gtk/PopupMenuGtk.cpp
@@ -27,6 +27,7 @@
#include "CString.h"
#include "FrameView.h"
+#include "GtkVersioning.h"
#include "HostWindow.h"
#include "PlatformString.h"
#include <gtk/gtk.h>
@@ -57,7 +58,7 @@ void PopupMenu::show(const IntRect& rect, FrameView* view, int index)
gtk_container_foreach(GTK_CONTAINER(m_popup.get()), reinterpret_cast<GtkCallback>(menuRemoveItem), this);
int x, y;
- gdk_window_get_origin(GTK_WIDGET(view->hostWindow()->platformPageClient())->window, &x, &y);
+ gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(view->hostWindow()->platformPageClient())), &x, &y);
m_menuPosition = view->contentsToWindow(rect.location());
m_menuPosition = IntPoint(m_menuPosition.x() + x, m_menuPosition.y() + y + rect.height());
m_indexMap.clear();
diff --git a/WebCore/platform/gtk/WidgetGtk.cpp b/WebCore/platform/gtk/WidgetGtk.cpp
index 834c21a..339514d 100644
--- a/WebCore/platform/gtk/WidgetGtk.cpp
+++ b/WebCore/platform/gtk/WidgetGtk.cpp
@@ -60,7 +60,7 @@ void Widget::setFocus()
static GdkDrawable* gdkDrawable(PlatformWidget widget)
{
- return widget ? widget->window : 0;
+ return widget ? gtk_widget_get_window(widget) : 0;
}
void Widget::setCursor(const Cursor& cursor)
@@ -76,7 +76,7 @@ void Widget::setCursor(const Cursor& cursor)
if (platformCursor == lastSetCursor)
return;
- gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : GTK_WIDGET(root()->hostWindow()->platformPageClient())->window, platformCursor);
+ gdk_window_set_cursor(gdkDrawable(platformWidget()) ? GDK_WINDOW(gdkDrawable(platformWidget())) : gtk_widget_get_window(GTK_WIDGET(root()->hostWindow()->platformPageClient())), platformCursor);
lastSetCursor = platformCursor;
}
diff --git a/WebKit/gtk/ChangeLog b/WebKit/gtk/ChangeLog
index 4271c2f..0fc742a 100644
--- a/WebKit/gtk/ChangeLog
+++ b/WebKit/gtk/ChangeLog
@@ -1,3 +1,21 @@
+2010-06-07 Martin Robinson <mrobinson at 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.
+
2010-05-03 Abhishek Arya <inferno at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
index 87c766f..aa5ce1d 100644
--- a/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp
@@ -335,7 +335,7 @@ void ChromeClient::invalidateWindow(const IntRect&, bool)
void ChromeClient::invalidateContentsAndWindow(const IntRect& updateRect, bool immediate)
{
GdkRectangle rect = updateRect;
- GdkWindow* window = GTK_WIDGET(m_webView)->window;
+ GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(m_webView));
if (window) {
gdk_window_invalidate_rect(window, &rect, FALSE);
@@ -352,7 +352,7 @@ void ChromeClient::invalidateContentsForSlowScroll(const IntRect& updateRect, bo
void ChromeClient::scroll(const IntSize& delta, const IntRect& rectToScroll, const IntRect& clipRect)
{
- GdkWindow* window = GTK_WIDGET(m_webView)->window;
+ GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(m_webView));
if (!window)
return;
@@ -390,7 +390,7 @@ static IntPoint widgetScreenPosition(GtkWidget* widget)
IntPoint result(widgetX, widgetY);
int originX, originY;
- gdk_window_get_origin(window->window, &originX, &originY);
+ gdk_window_get_origin(gtk_widget_get_window(window), &originX, &originY);
result.move(originX, originY);
return result;
diff --git a/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp b/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp
index 66f81df..6c395c7 100644
--- a/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp
+++ b/WebKit/gtk/WebCoreSupport/DragClientGtk.cpp
@@ -28,16 +28,13 @@
#include "Frame.h"
#include "GOwnPtrGtk.h"
#include "GRefPtrGtk.h"
+#include "GtkVersioning.h"
#include "NotImplemented.h"
#include "PasteboardHelper.h"
#include "RenderObject.h"
#include "webkitprivate.h"
#include "webkitwebview.h"
-
#include <gtk/gtk.h>
-#if !GTK_CHECK_VERSION(2, 14, 0)
-#define gtk_widget_get_window(widget) (widget)->window
-#endif
using namespace WebCore;
diff --git a/WebKit/gtk/webkit/webkitwebview.cpp b/WebKit/gtk/webkit/webkitwebview.cpp
index 1f3a445..3fd2563 100644
--- a/WebKit/gtk/webkit/webkitwebview.cpp
+++ b/WebKit/gtk/webkit/webkitwebview.cpp
@@ -369,7 +369,7 @@ static gboolean webkit_web_view_popup_menu_handler(GtkWidget* widget)
}
int x, y;
- gdk_window_get_origin(GTK_WIDGET(view->hostWindow()->platformPageClient())->window, &x, &y);
+ gdk_window_get_origin(gtk_widget_get_window(GTK_WIDGET(view->hostWindow()->platformPageClient())), &x, &y);
// FIXME: The IntSize(0, -1) is a hack to get the hit-testing to result in the selected element.
// Ideally we'd have the position of a context menu event be separate from its target node.
@@ -610,7 +610,7 @@ static gboolean webkit_web_view_button_press_event(GtkWidget* widget, GdkEventBu
gint doubleClickDistance = 250;
gint doubleClickTime = 5;
- GtkSettings* settings = gtk_settings_get_for_screen(gdk_drawable_get_screen(widget->window));
+ GtkSettings* settings = gtk_settings_get_for_screen(gdk_drawable_get_screen(gtk_widget_get_window(widget)));
g_object_get(settings,
"gtk-double-click-distance", &doubleClickDistance,
"gtk-double-click-time", &doubleClickTime, NULL);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list