Changeset 42199 in webkit

Timestamp:

Apr 3, 2009 6:00:35 AM (15 years ago)

Author:

kov@webkit.org

Message:

2009-04-03 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Holger Freyther.

Require GTK+ >= 2.10; 2.8 is already very old, and some very
useful APIs are only available since 2.10.

• configure.ac:

WebCore/

2009-04-03 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Holger Freyther.

Remove pre-processor checks for GTK+ >= 2.10, since we now require
at least that version.

• platform/graphics/gtk/FontPlatformDataGtk.cpp: (WebCore::FontPlatformData::FontPlatformData):
• platform/gtk/ContextMenuItemGtk.cpp: (WebCore::gtkStockIDFromContextMenuAction):
• platform/gtk/KeyEventGtk.cpp: (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
• platform/gtk/LocalizedStringsGtk.cpp: (WebCore::contextMenuItemTagSelectAll):
• platform/gtk/MouseEventGtk.cpp: (WebCore::PlatformMouseEvent::PlatformMouseEvent):
• platform/gtk/PasteboardGtk.cpp: (WebCore::Pasteboard::writeSelection): (WebCore::Pasteboard::documentFragment):
• platform/gtk/WheelEventGtk.cpp: (WebCore::PlatformWheelEvent::PlatformWheelEvent):

WebKit/gtk

2009-04-03 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Holger Freyther.

Remove pre-processor checks for GTK+ >= 2.10, since we now require
at least that version.

• WebCoreSupport/EditorClientGtk.cpp: (WebKit::clipboard_clear_contents_cb): (WebKit::EditorClient::respondToChangedSelection):
• webkit/webkitwebframe.cpp:
• webkit/webkitwebview.cpp:

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp (modified) (2 diffs)
• WebCore/platform/gtk/ContextMenuItemGtk.cpp (modified) (1 diff)
• WebCore/platform/gtk/KeyEventGtk.cpp (modified) (2 diffs)
• WebCore/platform/gtk/LocalizedStringsGtk.cpp (modified) (1 diff)
• WebCore/platform/gtk/MouseEventGtk.cpp (modified) (2 diffs)
• WebCore/platform/gtk/PasteboardGtk.cpp (modified) (3 diffs)
• WebCore/platform/gtk/WheelEventGtk.cpp (modified) (2 diffs)
• WebKit/gtk/ChangeLog (modified) (1 diff)
• WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp (modified) (4 diffs)
• WebKit/gtk/webkit/webkitwebframe.cpp (modified) (2 diffs)
• WebKit/gtk/webkit/webkitwebview.cpp (modified) (7 diffs)
• configure.ac (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2009-04-03  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Holger Freyther.
+
+        Require GTK+ >= 2.10; 2.8 is already very old, and some very
+        useful APIs are only available since 2.10.
+
+        * configure.ac:
+
 2009-04-01  Christian Dywan  <christian@twotoasts.de>
 

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-04-03  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Holger Freyther.
+
+        Remove pre-processor checks for GTK+ >= 2.10, since we now require
+        at least that version.
+
+        * platform/graphics/gtk/FontPlatformDataGtk.cpp:
+        (WebCore::FontPlatformData::FontPlatformData):
+        * platform/gtk/ContextMenuItemGtk.cpp:
+        (WebCore::gtkStockIDFromContextMenuAction):
+        * platform/gtk/KeyEventGtk.cpp:
+        (WebCore::PlatformKeyboardEvent::PlatformKeyboardEvent):
+        * platform/gtk/LocalizedStringsGtk.cpp:
+        (WebCore::contextMenuItemTagSelectAll):
+        * platform/gtk/MouseEventGtk.cpp:
+        (WebCore::PlatformMouseEvent::PlatformMouseEvent):
+        * platform/gtk/PasteboardGtk.cpp:
+        (WebCore::Pasteboard::writeSelection):
+        (WebCore::Pasteboard::documentFragment):
+        * platform/gtk/WheelEventGtk.cpp:
+        (WebCore::PlatformWheelEvent::PlatformWheelEvent):
+
 2009-04-02  Simon Fraser  <simon.fraser@apple.com>
 

trunk/WebCore/platform/graphics/gtk/FontPlatformDataGtk.cpp

@@ -110 +110 @@
     cairo_matrix_init_identity(&ctm);
 
-#if GTK_CHECK_VERSION(2,10,0)
     if (GdkScreen* screen = gdk_screen_get_default())
         options = gdk_screen_get_font_options(screen);
-#endif
+
     // gdk_screen_get_font_options() returns NULL if no default options are
     // set, so we always have to check.
@@ -151 +150 @@
     const cairo_font_options_t* options = NULL;
 
-#if GTK_CHECK_VERSION(2,10,0)
     if (GdkScreen* screen = gdk_screen_get_default())
         options = gdk_screen_get_font_options(screen);
-#endif
+
     // gdk_screen_get_font_options() returns NULL if no default options are
     // set, so we always have to check.

trunk/WebCore/platform/gtk/ContextMenuItemGtk.cpp

@@ -57 +57 @@
     case ContextMenuItemTagDelete:
         return GTK_STOCK_DELETE;
-#if GTK_CHECK_VERSION(2, 10, 0)
     case ContextMenuItemTagSelectAll:
         return GTK_STOCK_SELECT_ALL;
-#endif
     case ContextMenuItemTagSpellingGuess:
         return GTK_STOCK_INFO;

trunk/WebCore/platform/gtk/KeyEventGtk.cpp

@@ -37 +37 @@
 #include <gdk/gdk.h>
 #include <gdk/gdkkeysyms.h>
-
-// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
-#include <gtk/gtk.h>
 
 namespace WebCore {
@@ -537 +534 @@
     , m_ctrlKey(event->state & GDK_CONTROL_MASK)
     , m_altKey(event->state & GDK_MOD1_MASK)
-#if GTK_CHECK_VERSION(2,10,0)
     , m_metaKey(event->state & GDK_META_MASK)
-#else
-    // GDK_MOD2_MASK doesn't always mean meta so we can't use it
-    , m_metaKey(false)
-#endif
     , m_gdkEventKey(event)
 {

trunk/WebCore/platform/gtk/LocalizedStringsGtk.cpp

@@ -126 +126 @@
 String contextMenuItemTagSelectAll()
 {
-#if GTK_CHECK_VERSION(2,10,0)
     static String stockLabel = String::fromUTF8(gtkStockLabel(GTK_STOCK_SELECT_ALL));
-#else
-    static String stockLabel = String::fromUTF8(_("Select _All"));
-#endif
     return stockLabel;
 }

trunk/WebCore/platform/gtk/MouseEventGtk.cpp

@@ -32 +32 @@
 #include <gdk/gdk.h>
 
-// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
-#include <gtk/gtk.h>
-
 namespace WebCore {
 
@@ -48 +45 @@
     m_ctrlKey = event->state & GDK_CONTROL_MASK;
     m_altKey = event->state & GDK_MOD1_MASK;
-#if GTK_CHECK_VERSION(2,10,0)
     m_metaKey = event->state & GDK_META_MASK;
-#else
-    // GDK_MOD2_MASK doesn't always mean meta so we can't use it
-    m_metaKey = false;
-#endif
 
     switch (event->type) {

trunk/WebCore/platform/gtk/PasteboardGtk.cpp

@@ -104 +104 @@
 {
     GtkClipboard* clipboard = m_helper->getClipboard(frame);
-#if GTK_CHECK_VERSION(2,10,0)
     gchar* text = g_strdup(frame->selectedText().utf8().data());
     gchar* markup = g_strdup(createMarkup(selectedRange, 0, AnnotateForInterchange).utf8().data());
@@ -114 +113 @@
                                 clipboard_get_contents_cb, clipboard_clear_contents_cb, data);
     gtk_target_table_free(targets, n_targets);
-#else
-    gtk_clipboard_set_text(clipboard, frame->selectedText().utf8().data(), frame->selectedText().utf8().length());
-#endif
 }
 
@@ -164 +160 @@
                                                           bool allowPlainText, bool& chosePlainText)
 {
-#if GTK_CHECK_VERSION(2,10,0)
     GdkAtom textHtml = gdk_atom_intern_static_string("text/html");
-#else
-    GdkAtom textHtml = gdk_atom_intern("text/html", false);
-#endif
     GtkClipboard* clipboard = m_helper->getClipboard(frame);
     chosePlainText = false;

trunk/WebCore/platform/gtk/WheelEventGtk.cpp

@@ -31 +31 @@
 
 #include <gdk/gdk.h>
-
-// GTK_CHECK_VERSION is defined in gtk/gtkversion.h
-#include <gtk/gtk.h>
 
 namespace WebCore {
@@ -70 +67 @@
     m_ctrlKey = event->state & GDK_CONTROL_MASK;
     m_altKey = event->state & GDK_MOD1_MASK;
-#if GTK_CHECK_VERSION(2,10,0)
     m_metaKey = event->state & GDK_META_MASK;
-#else
-    // GDK_MOD2_MASK doesn't always mean meta so we can't use it
-    m_metaKey = false;
-#endif
 
     // FIXME: retrieve the user setting for the number of lines to scroll on each wheel event

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-04-03  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Holger Freyther.
+
+        Remove pre-processor checks for GTK+ >= 2.10, since we now require
+        at least that version.
+
+        * WebCoreSupport/EditorClientGtk.cpp:
+        (WebKit::clipboard_clear_contents_cb):
+        (WebKit::EditorClient::respondToChangedSelection):
+        * webkit/webkitwebframe.cpp:
+        * webkit/webkitwebview.cpp:
+
 2009-04-02  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/WebKit/gtk/WebCoreSupport/EditorClientGtk.cpp

@@ -165 +165 @@
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
 static void clipboard_get_contents_cb(GtkClipboard* clipboard, GtkSelectionData* selection_data, guint info, gpointer data)
 {
@@ -190 +189 @@
     frame->selection()->setBase(frame->selection()->extent(), frame->selection()->affinity());
 }
-#endif
 
 void EditorClient::respondToChangedSelection()
@@ -203 +201 @@
         return;
 
-#if GTK_CHECK_VERSION(2,10,0)
     GtkClipboard* clipboard = gtk_widget_get_clipboard(GTK_WIDGET(m_webView), GDK_SELECTION_PRIMARY);
     if (targetFrame->selection()->isRange()) {
@@ -214 +211 @@
     } else if (gtk_clipboard_get_owner(clipboard) == G_OBJECT(m_webView))
         gtk_clipboard_clear(clipboard);
-#endif
 
     if (!targetFrame->editor()->hasComposition())

trunk/WebKit/gtk/webkit/webkitwebframe.cpp

@@ -611 +611 @@
 }
 
-#if GTK_CHECK_VERSION(2,10,0)
-
 static void begin_print(GtkPrintOperation* op, GtkPrintContext* context, gpointer user_data)
 {
@@ -680 +678 @@
 }
 
-#else
-
-void webkit_web_frame_print(WebKitWebFrame*)
-{
-    g_warning("Printing support is not available in older versions of GTK+");
-}
-
-#endif
-
 bool webkit_web_frame_pause_animation(WebKitWebFrame* frame, const gchar* name, double time, const gchar* element)
 {

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -292 +292 @@
         g_value_set_string(value, webkit_web_view_get_uri(webView));
         break;
-#if GTK_CHECK_VERSION(2,10,0)
     case PROP_COPY_TARGET_LIST:
         g_value_set_boxed(value, webkit_web_view_get_copy_target_list(webView));
@@ -299 +298 @@
         g_value_set_boxed(value, webkit_web_view_get_paste_target_list(webView));
         break;
-#endif
     case PROP_EDITABLE:
         g_value_set_boolean(value, webkit_web_view_get_editable(webView));
@@ -1684 +1682 @@
                                                         WEBKIT_PARAM_READABLE));
 
-#if GTK_CHECK_VERSION(2,10,0)
     /**
     * WebKitWebView:copy-target-list:
@@ -1712 +1709 @@
                                                        GTK_TYPE_TARGET_LIST,
                                                        WEBKIT_PARAM_READABLE));
-#endif
 
     g_object_class_install_property(objectClass, PROP_SETTINGS,
@@ -1834 +1830 @@
 
     gdouble DPI = defaultDPI;
-#if GTK_CHECK_VERSION(2,10,0)
     GdkScreen* screen = gtk_widget_has_screen(GTK_WIDGET(webView)) ? gtk_widget_get_screen(GTK_WIDGET(webView)) : gdk_screen_get_default();
     if (screen) {
@@ -1842 +1837 @@
             DPI = defaultDPI;
     }
-#endif
     ASSERT(DPI > 0);
     return DPI;
@@ -2020 +2014 @@
     priv->zoomFullContent = FALSE;
 
-#if GTK_CHECK_VERSION(2,10,0)
     GdkAtom textHtml = gdk_atom_intern_static_string("text/html");
-#else
-    GdkAtom textHtml = gdk_atom_intern("text/html", false);
-#endif
     /* Targets for copy */
     priv->copy_target_list = gtk_target_list_new(NULL, 0);

trunk/configure.ac

@@ -184 +184 @@
 # minimum GTK+ base dependencies
 PANGO_REQUIRED_VERSION=1.0
-GTK_REQUIRED_VERSION=2.8
+GTK_REQUIRED_VERSION=2.10
 
 # optional modules