Changeset 199811 in webkit

Timestamp:

Apr 21, 2016 3:53:51 AM (8 years ago)

Author:

Carlos Garcia Campos

Message:

[GTK] WebKitWebView should claim the contents size as its natural size
​https://bugs.webkit.org/show_bug.cgi?id=156835

Reviewed by Žan Doberšek.

Source/WebKit2:

And keep claiming 0 as its minimum size since it's scrollable.

• UIProcess/API/gtk/PageClientImpl.cpp:

(WebKit::PageClientImpl::didChangeContentSize): Call webkitWebViewBaseSetContentsSize().

• UIProcess/API/gtk/PageClientImpl.h:
• UIProcess/API/gtk/WebKitWebViewBase.cpp:

(webkitWebViewBaseGetPreferredWidth): Return the contents width as natural width.
(webkitWebViewBaseGetPreferredHeight): Return the contents height as natural height.
(webkit_web_view_base_class_init): Add implementations of get_preferred_width/height.
(webkitWebViewBaseSetContentsSize): Save the contents size.

• UIProcess/API/gtk/WebKitWebViewBasePrivate.h:

Tools:

Add test case to check the WebKitWebView preferred size.

• TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:

(testWebViewPreferredSize):
(beforeAll):

Location:

trunk

Files:

• Source/WebKit2/ChangeLog (modified) (1 diff)
• Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (modified) (1 diff)
• Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (modified) (1 diff)
• Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (modified) (4 diffs)
• Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h (modified) (1 diff)
• Tools/ChangeLog (modified) (1 diff)
• Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebKitWebView should claim the contents size as its natural size
+        https://bugs.webkit.org/show_bug.cgi?id=156835
+
+        Reviewed by Žan Doberšek.
+
+        And keep claiming 0 as its minimum size since it's scrollable.
+
+        * UIProcess/API/gtk/PageClientImpl.cpp:
+        (WebKit::PageClientImpl::didChangeContentSize): Call webkitWebViewBaseSetContentsSize().
+        * UIProcess/API/gtk/PageClientImpl.h:
+        * UIProcess/API/gtk/WebKitWebViewBase.cpp:
+        (webkitWebViewBaseGetPreferredWidth): Return the contents width as natural width.
+        (webkitWebViewBaseGetPreferredHeight): Return the contents height as natural height.
+        (webkit_web_view_base_class_init): Add implementations of get_preferred_width/height.
+        (webkitWebViewBaseSetContentsSize): Save the contents size.
+        * UIProcess/API/gtk/WebKitWebViewBasePrivate.h:
+
 2016-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
 

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

@@ -254 +254 @@
 }
 
+void PageClientImpl::didChangeContentSize(const IntSize& size)
+{
+    webkitWebViewBaseSetContentsSize(WEBKIT_WEB_VIEW_BASE(m_viewWidget), size);
+}
+
 #if ENABLE(DRAG_SUPPORT)
 void PageClientImpl::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)

trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h

@@ -96 +96 @@
 
     void handleDownloadRequest(DownloadProxy*) override;
-    void didChangeContentSize(const WebCore::IntSize&) override { }
+    void didChangeContentSize(const WebCore::IntSize&) override;
     void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
     void didFailLoadForMainFrame() override { }

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

@@ -192 +192 @@
     KeyBindingTranslator keyBindingTranslator;
     TouchEventsMap touchEvents;
+    IntSize contentsSize;
 
     GtkWindow* toplevelOnScreenWindow;
@@ -697 +698 @@
 }
 
+static void webkitWebViewBaseGetPreferredWidth(GtkWidget* widget, gint* minimumSize, gint* naturalSize)
+{
+    WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(widget)->priv;
+    *minimumSize = 0;
+    *naturalSize = priv->contentsSize.width();
+}
+
+static void webkitWebViewBaseGetPreferredHeight(GtkWidget* widget, gint* minimumSize, gint* naturalSize)
+{
+    WebKitWebViewBasePrivate* priv = WEBKIT_WEB_VIEW_BASE(widget)->priv;
+    *minimumSize = 0;
+    *naturalSize = priv->contentsSize.height();
+}
+
 static void webkitWebViewBaseMap(GtkWidget* widget)
 {
@@ -1166 +1181 @@
     widgetClass->draw = webkitWebViewBaseDraw;
     widgetClass->size_allocate = webkitWebViewBaseSizeAllocate;
+    widgetClass->get_preferred_width = webkitWebViewBaseGetPreferredWidth;
+    widgetClass->get_preferred_height = webkitWebViewBaseGetPreferredHeight;
     widgetClass->map = webkitWebViewBaseMap;
     widgetClass->unmap = webkitWebViewBaseUnmap;
@@ -1510 +1527 @@
 }
 
+void webkitWebViewBaseSetContentsSize(WebKitWebViewBase* webkitWebViewBase, const IntSize& contentsSize)
+{
+    WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
+    if (priv->contentsSize == contentsSize)
+        return;
+    priv->contentsSize = contentsSize;
+}
+
 void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase)
 {

trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h

@@ -56 +56 @@
 void webkitWebViewBaseSetInputMethodState(WebKitWebViewBase*, bool enabled);
 void webkitWebViewBaseUpdateTextInputState(WebKitWebViewBase*);
+void webkitWebViewBaseSetContentsSize(WebKitWebViewBase*, const WebCore::IntSize&);
 
 void webkitWebViewBaseSetFocus(WebKitWebViewBase*, bool focused);

trunk/Tools/ChangeLog

@@ +1 @@
+2016-04-21  Carlos Garcia Campos  <cgarcia@igalia.com>
+
+        [GTK] WebKitWebView should claim the contents size as its natural size
+        https://bugs.webkit.org/show_bug.cgi?id=156835
+
+        Reviewed by Žan Doberšek.
+
+        Add test case to check the WebKitWebView preferred size.
+
+        * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp:
+        (testWebViewPreferredSize):
+        (beforeAll):
+
 2016-04-20  Simon Fraser  <simon.fraser@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp

@@ -854 +854 @@
 }
 
+static void testWebViewPreferredSize(WebViewTest* test, gconstpointer)
+{
+    test->loadHtml("<html style='width: 325px; height: 615px'></html>", nullptr);
+    test->waitUntilLoadFinished();
+    test->showInWindowAndWaitUntilMapped();
+    GtkRequisition minimunSize, naturalSize;
+    gtk_widget_get_preferred_size(GTK_WIDGET(test->m_webView), &minimunSize, &naturalSize);
+    g_assert_cmpint(minimunSize.width, ==, 0);
+    g_assert_cmpint(minimunSize.height, ==, 0);
+    g_assert_cmpint(naturalSize.width, ==, 325);
+    g_assert_cmpint(naturalSize.height, ==, 615);
+}
+
 static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
 {
@@ -888 +901 @@
     IsPlayingAudioWebViewTest::add("WebKitWebView", "is-playing-audio", testWebViewIsPlayingAudio);
     WebViewTest::add("WebKitWebView", "background-color", testWebViewBackgroundColor);
+    WebViewTest::add("WebKitWebView", "preferred-size", testWebViewPreferredSize);
 }