Changeset 70983 in webkit

Timestamp:

Oct 30, 2010 8:17:06 AM (13 years ago)

Author:

xan@webkit.org

Message:

2010-10-30 Xan Lopez <​xlopez@igalia.com>

Reviewed by Martin Robinson.

[GTK] Use new width for height APIs in GTK+ 3.x
​https://bugs.webkit.org/show_bug.cgi?id=48709

Use the new width for height APIs in GTK+ 3.x, since size-request
is deprecated.

For now we just return the same value for preferred and minimum
width/height, which should match the 2.x behavior. Probably we
could do something smarter for the minimum values.

• webkit/webkitwebview.cpp: (webkit_web_view_get_preferred_width): return our preferred width. (webkit_web_view_get_preferred_height): return our preferred height. (webkit_web_view_class_init): hook the new default handlers.

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (3 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2010-10-30  Xan Lopez  <xlopez@igalia.com>
+
+        Reviewed by Martin Robinson.
+
+        [GTK] Use new width for height APIs in GTK+ 3.x
+        https://bugs.webkit.org/show_bug.cgi?id=48709
+
+        Use the new width for height APIs in GTK+ 3.x, since size-request
+        is deprecated.
+
+        For now we just return the same value for preferred and minimum
+        width/height, which should match the 2.x behavior. Probably we
+        could do something smarter for the minimum values.
+
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_get_preferred_width): return our preferred width.
+        (webkit_web_view_get_preferred_height): return our preferred height.
+        (webkit_web_view_class_init): hook the new default handlers.
+
 2010-10-29  Daniel Bates  <dbates@rim.com>
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -869 +869 @@
 }
 
+#ifdef GTK_API_VERSION_2
 static void webkit_web_view_size_request(GtkWidget* widget, GtkRequisition* requisition)
 {
@@ -883 +884 @@
     requisition->height = view->contentsHeight();
 }
+#else
+static void webkit_web_view_get_preferred_width(GtkWidget* widget, gint* minimum, gint* natural)
+{
+    WebKitWebView* web_view = WEBKIT_WEB_VIEW(widget);
+    Frame* coreFrame = core(webkit_web_view_get_main_frame(web_view));
+    if (!coreFrame)
+        return;
+
+    FrameView* view = coreFrame->view();
+    if (!view)
+        return;
+
+    *minimum = *natural = view->contentsWidth();
+}
+
+static void webkit_web_view_get_preferred_height(GtkWidget* widget, gint* minimum, gint* natural)
+{
+    WebKitWebView* web_view = WEBKIT_WEB_VIEW(widget);
+    Frame* coreFrame = core(webkit_web_view_get_main_frame(web_view));
+    if (!coreFrame)
+        return;
+
+    FrameView* view = coreFrame->view();
+    if (!view)
+        return;
+
+    *minimum = *natural = view->contentsHeight();
+}
+#endif
 
 static void webkit_web_view_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
@@ -2603 +2633 @@
     widgetClass->scroll_event = webkit_web_view_scroll_event;
     widgetClass->size_allocate = webkit_web_view_size_allocate;
+#ifdef GTK_API_VERSION_2
     widgetClass->size_request = webkit_web_view_size_request;
+#else
+    widgetClass->get_preferred_width = webkit_web_view_get_preferred_width;
+    widgetClass->get_preferred_height = webkit_web_view_get_preferred_height;
+#endif
     widgetClass->popup_menu = webkit_web_view_popup_menu_handler;
     widgetClass->grab_focus = webkit_web_view_grab_focus;