Changeset 56387 in webkit

Timestamp:

Mar 23, 2010 6:23:26 AM (14 years ago)

Author:

kov@webkit.org

Message:

WebCore

2010-03-23 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Holger Freyther.

[GTK] Does not build with latest GTK+ development release
​https://bugs.webkit.org/show_bug.cgi?id=36398

Fix building with newest GTK+ versions.

• GNUmakefile.am:
• platform/gtk/GtkPluginWidget.cpp: (WebCore::GtkPluginWidget::invalidateRect): (WebCore::GtkPluginWidget::paint):
• platform/gtk/GtkVersioning.h: Added.
• platform/gtk/PlatformScreenGtk.cpp: (WebCore::getVisual): (WebCore::screenRect): (WebCore::screenAvailableRect):
• platform/gtk/ScrollbarGtk.cpp: (ScrollbarGtk::paint):
• plugins/gtk/gtk2xtbin.c: (gtk_xtbin_set_position): (gtk_xtbin_unrealize):

WebKit/gtk

2010-03-23 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Holger Freyther.

[GTK] Does not build with latest GTK+ development release
​https://bugs.webkit.org/show_bug.cgi?id=36398

Fix building with newest GTK+ versions.

• WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::windowRect): (WebKit::ChromeClient::setWindowRect): (WebKit::ChromeClient::unfocus): (WebKit::ChromeClient::canTakeFocus): (WebKit::ChromeClient::contentsSizeChanged):
• webkit/webkitprivate.cpp: (currentToplevelCallback):
• webkit/webkitwebframe.cpp: (webkit_web_frame_print_full): (webkit_web_frame_print):
• webkit/webkitwebview.cpp: (webkit_web_view_grab_focus): (webkit_web_view_focus_in_event): (webkit_web_view_script_dialog):

Location:

trunk

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/GNUmakefile.am (modified) (1 diff)
• WebCore/platform/gtk/GtkPluginWidget.cpp (modified) (3 diffs)
• WebCore/platform/gtk/GtkVersioning.h (added)
• WebCore/platform/gtk/PlatformScreenGtk.cpp (modified) (4 diffs)
• WebCore/platform/gtk/ScrollbarGtk.cpp (modified) (2 diffs)
• WebCore/plugins/gtk/gtk2xtbin.c (modified) (3 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp (modified) (6 diffs)
• WebKit/gtk/webkit/webkitprivate.cpp (modified) (2 diffs)
• WebKit/gtk/webkit/webkitwebframe.cpp (modified) (4 diffs)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (4 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-03-23  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Holger Freyther.
+
+        [GTK] Does not build with latest GTK+ development release
+        https://bugs.webkit.org/show_bug.cgi?id=36398
+
+        Fix building with newest GTK+ versions.
+
+        * GNUmakefile.am:
+        * platform/gtk/GtkPluginWidget.cpp:
+        (WebCore::GtkPluginWidget::invalidateRect):
+        (WebCore::GtkPluginWidget::paint):
+        * platform/gtk/GtkVersioning.h: Added.
+        * platform/gtk/PlatformScreenGtk.cpp:
+        (WebCore::getVisual):
+        (WebCore::screenRect):
+        (WebCore::screenAvailableRect):
+        * platform/gtk/ScrollbarGtk.cpp:
+        (ScrollbarGtk::paint):
+        * plugins/gtk/gtk2xtbin.c:
+        (gtk_xtbin_set_position):
+        (gtk_xtbin_unrealize):
+
 2010-03-23  Laszlo Gombos  <laszlo.1.gombos@nokia.com>
 

trunk/WebCore/GNUmakefile.am

@@ -2054 +2054 @@
         WebCore/platform/gtk/GtkPluginWidget.cpp \
         WebCore/platform/gtk/GtkPluginWidget.h \
+        WebCore/platform/gtk/GtkVersioning.h \
         WebCore/platform/gtk/KURLGtk.cpp \
         WebCore/platform/gtk/KeyEventGtk.cpp \

trunk/WebCore/platform/gtk/GtkPluginWidget.cpp

@@ -29 +29 @@
 
 #include "GraphicsContext.h"
+#include "GtkVersioning.h"
 #include "ScrollView.h"
 
@@ -44 +45 @@
 {
     /* no need to */
-    if (GTK_WIDGET_NO_WINDOW(platformWidget()))
+    if (!gtk_widget_get_has_window(platformWidget()))
         return;
 
@@ -71 +72 @@
         return;
 
-    /* only paint widgets with NO_WINDOW this way */
-    if (!GTK_WIDGET_NO_WINDOW(platformWidget()))
+    /* only paint widgets with no window this way */
+    if (gtk_widget_get_has_window(platformWidget()))
         return;
 
     GtkWidget* widget = platformWidget();
-    ASSERT(GTK_WIDGET_NO_WINDOW(widget));
+    ASSERT(!gtk_widget_get_has_window(widget));
 
     GdkEvent* event = gdk_event_new(GDK_EXPOSE);

trunk/WebCore/platform/gtk/PlatformScreenGtk.cpp

@@ -32 +32 @@
 #include "PlatformScreen.h"
 
+#include "GtkVersioning.h"
 #include "HostWindow.h"
 #include "ScrollView.h"
@@ -55 +56 @@
         return 0;
 
-    if (!GTK_WIDGET_REALIZED(container)) {
+    if (!gtk_widget_get_realized(container)) {
         GtkWidget* toplevel = gtk_widget_get_toplevel(container);
-#if GTK_CHECK_VERSION(2, 18, 0)
         if (gtk_widget_is_toplevel(toplevel))
-#else
-        if (GTK_WIDGET_TOPLEVEL(toplevel))
-#endif
             container = toplevel;
         else
@@ -99 +96 @@
 
     GtkWidget* container = gtk_widget_get_toplevel(GTK_WIDGET(widget->root()->hostWindow()->platformPageClient()));
-#if GTK_CHECK_VERSION(2, 18, 0)
     if (!gtk_widget_is_toplevel(container))
-#else
-    if (!GTK_WIDGET_TOPLEVEL(container))
-#endif
         return FloatRect();
 
@@ -127 +120 @@
         return FloatRect();
 
-    if (!GTK_WIDGET_REALIZED(container))
+    if (!gtk_widget_get_realized(container))
         return screenRect(widget);
 

trunk/WebCore/platform/gtk/ScrollbarGtk.cpp

@@ -197 +197 @@
  * 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
+ *  2.) We assume that the widget has no window and that frameRectsChanged positioned
  *      the widget correctly. ATM we do not honor the GraphicsContext translation.
  */
@@ -209 +209 @@
 
     GtkWidget* widget = platformWidget();
-    ASSERT(GTK_WIDGET_NO_WINDOW(widget));
+    ASSERT(!gtk_widget_get_has_window(widget));
 
     GdkEvent* event = gdk_event_new(GDK_EXPOSE);

trunk/WebCore/plugins/gtk/gtk2xtbin.c

@@ -43 +43 @@
  */
 
+#include "GtkVersioning.h"
 #include "xembed.h"
 #include "gtk2xtbin.h"
@@ -402 +403 @@
   xtbin->y = y;
 
-  if (GTK_WIDGET_REALIZED (xtbin))
+  if (gtk_widget_get_realized (xtbin))
     gdk_window_move (GTK_WIDGET (xtbin)->window, x, y);
 }
@@ -457 +458 @@
 
   GTK_WIDGET_UNSET_FLAGS (widget, GTK_VISIBLE);
-  if (GTK_WIDGET_REALIZED (widget)) {
+  if (gtk_widget_get_realized (widget)) {
     xt_client_unrealize(&(xtbin->xtclient));
   }

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-03-23  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Holger Freyther.
+
+        [GTK] Does not build with latest GTK+ development release
+        https://bugs.webkit.org/show_bug.cgi?id=36398
+
+        Fix building with newest GTK+ versions.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::windowRect):
+        (WebKit::ChromeClient::setWindowRect):
+        (WebKit::ChromeClient::unfocus):
+        (WebKit::ChromeClient::canTakeFocus):
+        (WebKit::ChromeClient::contentsSizeChanged):
+        * webkit/webkitprivate.cpp:
+        (currentToplevelCallback):
+        * webkit/webkitwebframe.cpp:
+        (webkit_web_frame_print_full):
+        (webkit_web_frame_print):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_grab_focus):
+        (webkit_web_view_focus_in_event):
+        (webkit_web_view_script_dialog):
+
 2010-03-18  Philip Chimento  <philip.chimento@gmail.com>
 

trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -29 +29 @@
 #include "FloatRect.h"
 #include "FrameLoadRequest.h"
+#include "GtkVersioning.h"
 #include "IntRect.h"
 #include "PlatformString.h"
@@ -66 +67 @@
 {
     GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView));
-#if GTK_CHECK_VERSION(2, 18, 0)
     if (gtk_widget_is_toplevel(window)) {
-#else
-    if (GTK_WIDGET_TOPLEVEL(window)) {
-#endif
         gint left, top, width, height;
         gtk_window_get_position(GTK_WINDOW(window), &left, &top);
@@ -99 +96 @@
 
     GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView));
-#if GTK_CHECK_VERSION(2, 18, 0)
     if (gtk_widget_is_toplevel(window)) {
-#else
-    if (GTK_WIDGET_TOPLEVEL(window)) {
-#endif
         gtk_window_move(GTK_WINDOW(window), intrect.x(), intrect.y());
         gtk_window_resize(GTK_WINDOW(window), intrect.width(), intrect.height());
@@ -129 +122 @@
 {
     GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(m_webView));
-#if GTK_CHECK_VERSION(2, 18, 0)
     if (gtk_widget_is_toplevel(window))
-#else
-    if (GTK_WIDGET_TOPLEVEL(window))
-#endif
         gtk_window_set_focus(GTK_WINDOW(window), NULL);
 }
@@ -261 +250 @@
 bool ChromeClient::canTakeFocus(FocusDirection)
 {
-#if GTK_CHECK_VERSION(2, 18, 0)
     return gtk_widget_get_can_focus(GTK_WIDGET(m_webView));
-#else
-    return GTK_WIDGET_CAN_FOCUS(m_webView);
-#endif
 }
 
@@ -440 +425 @@
     // otherwise we get into an infinite loop!
     GtkWidget* widget = GTK_WIDGET(m_webView);
-    if (GTK_WIDGET_REALIZED(widget)
+    if (gtk_widget_get_realized(widget)
         && (widget->requisition.height != size.height())
         || (widget->requisition.width != size.width()))

trunk/WebKit/gtk/webkit/webkitprivate.cpp

@@ -29 +29 @@
 #include "FrameLoader.h"
 #include "FrameLoaderClientGtk.h"
+#include "GtkVersioning.h"
 #include "HitTestResult.h"
 #include "IconDatabase.h"
@@ -224 +225 @@
 
     GtkWidget* toplevel =  gtk_widget_get_toplevel(GTK_WIDGET(frame->page()->chrome()->platformPageClient()));
-#if GTK_CHECK_VERSION(2, 18, 0)
     if (gtk_widget_is_toplevel(toplevel))
-#else
-    if (GTK_WIDGET_TOPLEVEL(toplevel))
-#endif
         return toplevel;
     else

trunk/WebKit/gtk/webkit/webkitwebframe.cpp

@@ -46 +46 @@
 #include "GCController.h"
 #include "GraphicsContext.h"
+#include "GtkVersioning.h"
 #include "HTMLFrameOwnerElement.h"
 #include "JSDOMWindow.h"
@@ -957 +958 @@
     GtkWidget* topLevel = gtk_widget_get_toplevel(GTK_WIDGET(webkit_web_frame_get_web_view(frame)));
 
-#if GTK_CHECK_VERSION(2, 18, 0)
     if (!gtk_widget_is_toplevel(topLevel))
-#else
-    if (!GTK_WIDGET_TOPLEVEL(topLevel))
-#endif
         topLevel = NULL;
 
@@ -1000 +997 @@
     if (error) {
         GtkWidget* window = gtk_widget_get_toplevel(GTK_WIDGET(priv->webView));
-#if GTK_CHECK_VERSION(2, 18, 0)
         GtkWidget* dialog = gtk_message_dialog_new(gtk_widget_is_toplevel(window) ? GTK_WINDOW(window) : 0,
                                                    GTK_DIALOG_DESTROY_WITH_PARENT,
@@ -1006 +1002 @@
                                                    GTK_BUTTONS_CLOSE,
                                                    "%s", error->message);
-#else
-        GtkWidget* dialog = gtk_message_dialog_new(GTK_WIDGET_TOPLEVEL(window) ? GTK_WINDOW(window) : 0,
-                                                   GTK_DIALOG_DESTROY_WITH_PARENT,
-                                                   GTK_MESSAGE_ERROR,
-                                                   GTK_BUTTONS_CLOSE,
-                                                   "%s", error->message);
-#endif
 
         g_error_free(error);

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -65 +65 @@
 #include <GOwnPtr.h>
 #include "GraphicsContext.h"
+#include "GtkVersioning.h"
 #include "HitTestRequest.h"
 #include "HitTestResult.h"
@@ -697 +698 @@
 {
 
-#if GTK_CHECK_VERSION(2, 18, 0)
     if (gtk_widget_is_sensitive(widget)) {
-#else
-    if (GTK_WIDGET_IS_SENSITIVE(widget)) {
-#endif
         WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
         FocusController* focusController = core(webView)->focusController();
@@ -721 +718 @@
     // http://bugs.webkit.org/show_bug.cgi?id=16910
     GtkWidget* toplevel = gtk_widget_get_toplevel(widget);
-#if GTK_CHECK_VERSION(2, 18, 0)
     if (gtk_widget_is_toplevel(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) {
-#else
-    if (GTK_WIDGET_TOPLEVEL(toplevel) && gtk_window_has_toplevel_focus(GTK_WINDOW(toplevel))) {
-#endif
         WebKitWebView* webView = WEBKIT_WEB_VIEW(widget);
         FocusController* focusController = core(webView)->focusController();
@@ -924 +917 @@
 
     window = gtk_widget_get_toplevel(GTK_WIDGET(webView));
-#if GTK_CHECK_VERSION(2, 18, 0)
     dialog = gtk_message_dialog_new(gtk_widget_is_toplevel(window) ? GTK_WINDOW(window) : 0, GTK_DIALOG_DESTROY_WITH_PARENT, messageType, buttons, "%s", message);
-#else
-    dialog = gtk_message_dialog_new(GTK_WIDGET_TOPLEVEL(window) ? GTK_WINDOW(window) : 0, GTK_DIALOG_DESTROY_WITH_PARENT, messageType, buttons, "%s", message);
-#endif
     gchar* title = g_strconcat("JavaScript - ", webkit_web_frame_get_uri(frame), NULL);
     gtk_window_set_title(GTK_WINDOW(dialog), title);