<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[199811] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/199811">199811</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-04-21 03:53:51 -0700 (Thu, 21 Apr 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[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):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkPageClientImplh">trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasePrivateh">trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp">trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (199810 => 199811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-04-21 10:50:59 UTC (rev 199810)
+++ trunk/Source/WebKit2/ChangeLog 2016-04-21 10:53:51 UTC (rev 199811)
</span><span class="lines">@@ -1,5 +1,24 @@
</span><span class="cx"> 2016-04-21 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><ins>+ [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>
+
</ins><span class="cx"> [GTK] WebKitWebView should propagate wheel events not handled by the web process
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=156834
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (199810 => 199811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2016-04-21 10:50:59 UTC (rev 199810)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2016-04-21 10:53:51 UTC (rev 199811)
</span><span class="lines">@@ -253,6 +253,11 @@
</span><span class="cx"> webkitWebViewSelectionDidChange(WEBKIT_WEB_VIEW(m_viewWidget));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void PageClientImpl::didChangeContentSize(const IntSize& size)
+{
+ webkitWebViewBaseSetContentsSize(WEBKIT_WEB_VIEW_BASE(m_viewWidget), size);
+}
+
</ins><span class="cx"> #if ENABLE(DRAG_SUPPORT)
</span><span class="cx"> void PageClientImpl::startDrag(const WebCore::DragData& dragData, PassRefPtr<ShareableBitmap> dragImage)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (199810 => 199811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2016-04-21 10:50:59 UTC (rev 199810)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2016-04-21 10:53:51 UTC (rev 199811)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> void willEnterAcceleratedCompositingMode() override;
</span><span class="cx">
</span><span class="cx"> void handleDownloadRequest(DownloadProxy*) override;
</span><del>- void didChangeContentSize(const WebCore::IntSize&) override { }
</del><ins>+ void didChangeContentSize(const WebCore::IntSize&) override;
</ins><span class="cx"> void didCommitLoadForMainFrame(const String& mimeType, bool useCustomContentProvider) override;
</span><span class="cx"> void didFailLoadForMainFrame() override { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp (199810 => 199811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-04-21 10:50:59 UTC (rev 199810)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBase.cpp 2016-04-21 10:53:51 UTC (rev 199811)
</span><span class="lines">@@ -191,6 +191,7 @@
</span><span class="cx"> InputMethodFilter inputMethodFilter;
</span><span class="cx"> KeyBindingTranslator keyBindingTranslator;
</span><span class="cx"> TouchEventsMap touchEvents;
</span><ins>+ IntSize contentsSize;
</ins><span class="cx">
</span><span class="cx"> GtkWindow* toplevelOnScreenWindow;
</span><span class="cx"> unsigned long toplevelFocusInEventID;
</span><span class="lines">@@ -696,6 +697,20 @@
</span><span class="cx"> drawingArea->setSize(viewRect.size(), IntSize(), IntSize());
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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();
+}
+
</ins><span class="cx"> static void webkitWebViewBaseMap(GtkWidget* widget)
</span><span class="cx"> {
</span><span class="cx"> GTK_WIDGET_CLASS(webkit_web_view_base_parent_class)->map(widget);
</span><span class="lines">@@ -1165,6 +1180,8 @@
</span><span class="cx"> widgetClass->unrealize = webkitWebViewBaseUnrealize;
</span><span class="cx"> widgetClass->draw = webkitWebViewBaseDraw;
</span><span class="cx"> widgetClass->size_allocate = webkitWebViewBaseSizeAllocate;
</span><ins>+ widgetClass->get_preferred_width = webkitWebViewBaseGetPreferredWidth;
+ widgetClass->get_preferred_height = webkitWebViewBaseGetPreferredHeight;
</ins><span class="cx"> widgetClass->map = webkitWebViewBaseMap;
</span><span class="cx"> widgetClass->unmap = webkitWebViewBaseUnmap;
</span><span class="cx"> widgetClass->focus = webkitWebViewBaseFocus;
</span><span class="lines">@@ -1509,6 +1526,14 @@
</span><span class="cx"> webkitWebViewBase->priv->inputMethodFilter.setCursorRect(editorState.postLayoutData().caretRectAtStart);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void webkitWebViewBaseSetContentsSize(WebKitWebViewBase* webkitWebViewBase, const IntSize& contentsSize)
+{
+ WebKitWebViewBasePrivate* priv = webkitWebViewBase->priv;
+ if (priv->contentsSize == contentsSize)
+ return;
+ priv->contentsSize = contentsSize;
+}
+
</ins><span class="cx"> void webkitWebViewBaseResetClickCounter(WebKitWebViewBase* webkitWebViewBase)
</span><span class="cx"> {
</span><span class="cx"> webkitWebViewBase->priv->clickCounter.reset();
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIgtkWebKitWebViewBasePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h (199810 => 199811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2016-04-21 10:50:59 UTC (rev 199810)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebViewBasePrivate.h 2016-04-21 10:53:51 UTC (rev 199811)
</span><span class="lines">@@ -55,6 +55,7 @@
</span><span class="cx"> GdkEvent* webkitWebViewBaseTakeContextMenuEvent(WebKitWebViewBase*);
</span><span class="cx"> void webkitWebViewBaseSetInputMethodState(WebKitWebViewBase*, bool enabled);
</span><span class="cx"> void webkitWebViewBaseUpdateTextInputState(WebKitWebViewBase*);
</span><ins>+void webkitWebViewBaseSetContentsSize(WebKitWebViewBase*, const WebCore::IntSize&);
</ins><span class="cx">
</span><span class="cx"> void webkitWebViewBaseSetFocus(WebKitWebViewBase*, bool focused);
</span><span class="cx"> bool webkitWebViewBaseIsInWindowActive(WebKitWebViewBase*);
</span></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (199810 => 199811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2016-04-21 10:50:59 UTC (rev 199810)
+++ trunk/Tools/ChangeLog 2016-04-21 10:53:51 UTC (rev 199811)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+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):
+
</ins><span class="cx"> 2016-04-20 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Add content animation tests to benchmark_runner, and allow the runner to collect device data as part of the results
</span></span></pre></div>
<a id="trunkToolsTestWebKitAPITestsWebKit2GtkTestWebKitWebViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp (199810 => 199811)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2016-04-21 10:50:59 UTC (rev 199810)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebView.cpp 2016-04-21 10:53:51 UTC (rev 199811)
</span><span class="lines">@@ -853,6 +853,19 @@
</span><span class="cx"> // MiniBrowser --bg-color="<color-value>" for manually testing this API.
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+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);
+}
+
</ins><span class="cx"> static void serverCallback(SoupServer* server, SoupMessage* message, const char* path, GHashTable*, SoupClientContext*, gpointer)
</span><span class="cx"> {
</span><span class="cx"> if (message->method != SOUP_METHOD_GET) {
</span><span class="lines">@@ -887,6 +900,7 @@
</span><span class="cx"> NotificationWebViewTest::add("WebKitWebView", "notification", testWebViewNotification);
</span><span class="cx"> IsPlayingAudioWebViewTest::add("WebKitWebView", "is-playing-audio", testWebViewIsPlayingAudio);
</span><span class="cx"> WebViewTest::add("WebKitWebView", "background-color", testWebViewBackgroundColor);
</span><ins>+ WebViewTest::add("WebKitWebView", "preferred-size", testWebViewPreferredSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void afterAll()
</span></span></pre>
</div>
</div>
</body>
</html>