Changeset 46123 in webkit

Timestamp:

Jul 20, 2009, 4:01:12 AM (16 years ago)

Author:

kov@webkit.org

Message:

2009-07-20 Gustavo Noronha Silva <​gustavo.noronha@collabora.co.uk>

Reviewed by Holger Freyther.

[GTK] Widget size negotiation
​https://bugs.webkit.org/show_bug.cgi?id=17154

Implement proper size request for the WebView widget.

• WebCoreSupport/ChromeClientGtk.cpp: (WebKit::ChromeClient::contentsSizeChanged):
• webkit/webkitwebview.cpp: (webkit_web_view_size_request): (webkit_web_view_class_init):

Location:

trunk/WebKit/gtk

Files:

• ChangeLog (modified) (1 diff)
• WebCoreSupport/ChromeClientGtk.cpp (modified) (1 diff)
• webkit/webkitwebview.cpp (modified) (2 diffs)

trunk/WebKit/gtk/ChangeLog

@@ +1 @@
+2009-07-20  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
+
+        Reviewed by Holger Freyther.
+
+        [GTK] Widget size negotiation
+        https://bugs.webkit.org/show_bug.cgi?id=17154
+
+        Implement proper size request for the WebView widget.
+
+        * WebCoreSupport/ChromeClientGtk.cpp:
+        (WebKit::ChromeClient::contentsSizeChanged):
+        * webkit/webkitwebview.cpp:
+        (webkit_web_view_size_request):
+        (webkit_web_view_class_init):
+
 2009-07-16  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebKit/gtk/WebCoreSupport/ChromeClientGtk.cpp

@@ -389 +389 @@
 }
 
-void ChromeClient::contentsSizeChanged(Frame*, const IntSize&) const
-{
-    notImplemented();
+void ChromeClient::contentsSizeChanged(Frame* frame, const IntSize& size) const
+{
+    // We need to queue a resize request only if the size changed,
+    // otherwise we get into an infinite loop!
+    GtkWidget* widget = GTK_WIDGET(m_webView);
+    if (GTK_WIDGET_REALIZED(widget) &&
+        (widget->requisition.height != size.height()) &&
+        (widget->requisition.width != size.width()))
+        gtk_widget_queue_resize_no_redraw(widget);
 }
 

trunk/WebKit/gtk/webkit/webkitwebview.cpp

@@ -546 +546 @@
 }
 
+static void webkit_web_view_size_request(GtkWidget* widget, GtkRequisition* requisition)
+{
+    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;
+
+    requisition->width = view->contentsWidth();
+    requisition->height = view->contentsHeight();
+}
+
 static void webkit_web_view_size_allocate(GtkWidget* widget, GtkAllocation* allocation)
 {
@@ -1795 +1810 @@
     widgetClass->scroll_event = webkit_web_view_scroll_event;
     widgetClass->size_allocate = webkit_web_view_size_allocate;
+    widgetClass->size_request = webkit_web_view_size_request;
     widgetClass->popup_menu = webkit_web_view_popup_menu_handler;
     widgetClass->grab_focus = webkit_web_view_grab_focus;