Changeset 89028 in webkit

Timestamp:

Jun 16, 2011 8:39:54 AM (13 years ago)

Author:

Carlos Garcia Campos

Message:

2011-06-16 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Xan Lopez.

[GTK] Remove support for GTK+2 in WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=62794

• configure.ac: Make WebKit2 require GTK+ 3.x.

2011-06-16 Carlos Garcia Campos <​cgarcia@igalia.com>

Reviewed by Xan Lopez.

[GTK] Remove support for GTK+2 in WebKit2
​https://bugs.webkit.org/show_bug.cgi?id=62794

• UIProcess/API/gtk/WebKitWebViewBase.cpp: (webkitWebViewBaseRealize): (webkitWebViewBaseDraw): (webkitWebViewBaseQueryTooltip): (webkit_web_view_base_class_init): (webkitWebViewBaseSetTooltipText):
• UIProcess/gtk/WebContextMenuProxyGtk.cpp: (WebKit::WebContextMenuProxyGtk::menuPositionFunction):
• WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp: (WebKit::moduleMixesGtkSymbols):

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (9 diffs)
• Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp (modified) (1 diff)
• Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp (modified) (1 diff)
• configure.ac (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2011-06-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Remove support for GTK+2 in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=62794
+
+        * configure.ac: Make WebKit2 require GTK+ 3.x.
+
 2011-06-15  Ryuan Choi  <ryuan.choi@samsung.com>
 

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2011-06-16  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        Reviewed by Xan Lopez.
+
+        [GTK] Remove support for GTK+2 in WebKit2
+        https://bugs.webkit.org/show_bug.cgi?id=62794
+
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseRealize):
+        (webkitWebViewBaseDraw):
+        (webkitWebViewBaseQueryTooltip):
+        (webkit_web_view_base_class_init):
+        (webkitWebViewBaseSetTooltipText):
+        * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+        (WebKit::WebContextMenuProxyGtk::menuPositionFunction):
+        * WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp:
+        (WebKit::moduleMixesGtkSymbols):
+
 2011-06-15  Adam Barth  <abarth@webkit.org>
 

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp

@@ -76 +76 @@
     attributes.wclass = GDK_INPUT_OUTPUT;
     attributes.visual = gtk_widget_get_visual(widget);
-#ifdef GTK_API_VERSION_2
-    attributes.colormap = gtk_widget_get_colormap(widget);
-#endif
     attributes.event_mask = GDK_VISIBILITY_NOTIFY_MASK
         | GDK_EXPOSURE_MASK
@@ -92 +89 @@
 
     gint attributesMask = GDK_WA_X | GDK_WA_Y | GDK_WA_VISUAL;
-#ifdef GTK_API_VERSION_2
-    attributesMask |= GDK_WA_COLORMAP;
-#endif
+
     GdkWindow* window = gdk_window_new(gtk_widget_get_parent_window(widget), &attributes, attributesMask);
     gtk_widget_set_window(widget, window);
     gdk_window_set_user_data(window, widget);
 
-#ifdef GTK_API_VERSION_2
-#if GTK_CHECK_VERSION(2, 20, 0)
-    gtk_widget_style_attach(widget);
-#else
-    widget->style = gtk_style_attach(gtk_widget_get_style(widget), window);
-#endif
-    gtk_style_set_background(gtk_widget_get_style(widget), window, GTK_STATE_NORMAL);
-#else
     gtk_style_context_set_background(gtk_widget_get_style_context(widget), window);
-#endif
 
     WebKitWebViewBase* webView = WEBKIT_WEB_VIEW_BASE(widget);
@@ -151 +137 @@
 }
 
-static void callDrawingAreaPaintMethod(DrawingAreaProxy* drawingArea, cairo_t* context, const IntRect& area)
-{
+static gboolean webkitWebViewBaseDraw(GtkWidget* widget, cairo_t* cr)
+{
+    DrawingAreaProxy* drawingArea = WEBKIT_WEB_VIEW_BASE(widget)->priv->pageProxy->drawingArea();
     if (!drawingArea)
-        return;
-
-    WebKit::Region unpaintedRegion; // This is simply unused.
-    static_cast<DrawingAreaProxyImpl*>(drawingArea)->paint(context, area, unpaintedRegion);
-}
-
-#ifdef GTK_API_VERSION_2
-static gboolean webkitWebViewBaseExpose(GtkWidget* widget, GdkEventExpose* event)
-{
-    GdkRectangle clipRect;
-    gdk_region_get_clipbox(event->region, &clipRect);
-
-    RefPtr<cairo_t> cr = adoptRef(gdk_cairo_create(gtk_widget_get_window(widget)));
-    callDrawingAreaPaintMethod(WEBKIT_WEB_VIEW_BASE(widget)->priv->pageProxy->drawingArea(), cr.get(), clipRect);
-    return FALSE;
-}
-#else
-static gboolean webkitWebViewBaseDraw(GtkWidget* widget, cairo_t* cr)
-{
+        return FALSE;
+
     GdkRectangle clipRect;
     if (!gdk_cairo_get_clip_rectangle(cr, &clipRect))
         return FALSE;
 
-    callDrawingAreaPaintMethod(WEBKIT_WEB_VIEW_BASE(widget)->priv->pageProxy->drawingArea(), cr, clipRect);
-    return FALSE;
-}
-#endif
+    WebKit::Region unpaintedRegion; // This is simply unused.
+    static_cast<DrawingAreaProxyImpl*>(drawingArea)->paint(cr, clipRect, unpaintedRegion);
+
+    return FALSE;
+}
 
 static void webkitWebViewBaseSizeAllocate(GtkWidget* widget, GtkAllocation* allocation)
@@ -291 +262 @@
 }
 
-#if GTK_CHECK_VERSION(2, 12, 0)
 static gboolean webkitWebViewBaseQueryTooltip(GtkWidget* widget, gint x, gint y, gboolean keyboardMode, GtkTooltip* tooltip)
 {
@@ -310 +280 @@
     return TRUE;
 }
-#endif
 
 static void webkit_web_view_base_class_init(WebKitWebViewBaseClass* webkitWebViewBaseClass)
@@ -316 +285 @@
     GtkWidgetClass* widgetClass = GTK_WIDGET_CLASS(webkitWebViewBaseClass);
     widgetClass->realize = webkitWebViewBaseRealize;
-#ifdef GTK_API_VERSION_2
-    widgetClass->expose_event = webkitWebViewBaseExpose;
-#else
     widgetClass->draw = webkitWebViewBaseDraw;
-#endif
     widgetClass->size_allocate = webkitWebViewBaseSizeAllocate;
     widgetClass->focus_in_event = webkitWebViewBaseFocusInEvent;
@@ -330 +295 @@
     widgetClass->scroll_event = webkitWebViewBaseScrollEvent;
     widgetClass->motion_notify_event = webkitWebViewBaseMotionNotifyEvent;
-#if GTK_CHECK_VERSION(2, 12, 0)
     widgetClass->query_tooltip = webkitWebViewBaseQueryTooltip;
-#endif
 
     GObjectClass* gobjectClass = G_OBJECT_CLASS(webkitWebViewBaseClass);
@@ -368 +331 @@
 void webkitWebViewBaseSetTooltipText(WebKitWebViewBase* webViewBase, const char* tooltip)
 {
-#if GTK_CHECK_VERSION(2, 12, 0)
     WebKitWebViewBasePrivate* priv = webViewBase->priv;
     if (tooltip && tooltip[0] != '\0') {
@@ -379 +341 @@
 
     gtk_widget_trigger_tooltip_query(GTK_WIDGET(webViewBase));
-#else
-    // TODO: Support older GTK+ versions
-    // See http://bugs.webkit.org/show_bug.cgi?id=15793
-    notImplemented();
-#endif
-}
-
-
+}
+
+

trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp

@@ -106 +106 @@
 {
     GtkRequisition menuSize;
-#ifdef GTK_API_VERSION_2
-    gtk_widget_size_request(GTK_WIDGET(menu), &menuSize);
-#else
     gtk_widget_get_preferred_size(GTK_WIDGET(menu), &menuSize, 0);
-#endif
 
     GdkScreen* screen = gtk_widget_get_screen(popupMenu->m_webView);

trunk/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp

@@ -135 +135 @@
 static bool moduleMixesGtkSymbols(Module* module)
 {
-#ifdef GTK_API_VERSION_2
-    return module->functionPointer<gpointer>("gtk_application_get_type");
-#else
     return module->functionPointer<gpointer>("gtk_object_get_type");
-#endif
 }
 #endif

trunk/configure.ac

@@ -1061 +1061 @@
                 [], [enable_webkit2="no"])
 AC_MSG_RESULT([$enable_webkit2])
+if test "$enable_webkit2" = "yes"; then
+   if test "$GTK_API_VERSION" = "2.0"; then
+      AC_MSG_ERROR([WebKit2 requires GTK+ 3.x, use --with-gtk=3.0])
+   fi
+fi
 
 # Plugin Process