<!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>[195202] releases/WebKitGTK/webkit-2.10</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/195202">195202</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-18 04:05:46 -0800 (Mon, 18 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/194480">r194480</a> - [SOUP] REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/192761">r192761</a>): Broke resource URIs for applications that use g_resource_load in a web extension
https://bugs.webkit.org/show_bug.cgi?id=152634
Reviewed by Carlos Garcia Campos.
Source/WebKit2:
Load GResource URIs locally, not in the network process. Applications expect calling
g_resource_load in a web extension to make it possible to load resource URIs, but that
doesn't work now that the network process is in use. Loading them locally solves this.
* WebProcess/Network/WebLoaderStrategy.cpp:
(WebKit::WebLoaderStrategy::scheduleLoad):
Tools:
* TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp:
(testLoadFromGResource): Added test.
(beforeAll):
* TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
(registerGResource): Added.
(webkit_web_extension_initialize_with_user_data): Load the test gresource.
* TestWebKitAPI/Tests/WebKit2Gtk/resources/boring.html: Added.
* TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml: Add an HTML file.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210SourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp">releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210ToolsChangeLog">releases/WebKitGTK/webkit-2.10/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit210ToolsTestWebKitAPITestsWebKit2GtkTestLoaderClientcpp">releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210ToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp">releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit210ToolsTestWebKitAPITestsWebKit2Gtkresourceswebkit2gtktestsgresourcexml">releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit210ToolsTestWebKitAPITestsWebKit2Gtkresourcesboringhtml">releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/boring.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit210SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog (195201 => 195202)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2016-01-18 11:55:26 UTC (rev 195201)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/ChangeLog 2016-01-18 12:05:46 UTC (rev 195202)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2016-01-01 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [SOUP] REGRESSION(r192761): Broke resource URIs for applications that use g_resource_load in a web extension
+ https://bugs.webkit.org/show_bug.cgi?id=152634
+
+ Reviewed by Carlos Garcia Campos.
+
+ Load GResource URIs locally, not in the network process. Applications expect calling
+ g_resource_load in a web extension to make it possible to load resource URIs, but that
+ doesn't work now that the network process is in use. Loading them locally solves this.
+
+ * WebProcess/Network/WebLoaderStrategy.cpp:
+ (WebKit::WebLoaderStrategy::scheduleLoad):
+
</ins><span class="cx"> 2015-12-09 Mario Sanchez Prada <mario@endlessm.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Crash in WebProcess when loading large content with custom URI schemes
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210SourceWebKit2WebProcessNetworkWebResourceLoadSchedulercpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp (195201 => 195202)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2016-01-18 11:55:26 UTC (rev 195201)
+++ releases/WebKitGTK/webkit-2.10/Source/WebKit2/WebProcess/Network/WebResourceLoadScheduler.cpp 2016-01-18 12:05:46 UTC (rev 195202)
</span><span class="lines">@@ -155,6 +155,16 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><ins>+#if USE(SOUP)
+ // For apps that call g_resource_load in a web extension.
+ // https://blogs.gnome.org/alexl/2012/01/26/resources-in-glib/
+ if (resourceLoader->request().url().protocolIs("resource")) {
+ LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be handled as a GResource.", resourceLoader->url().string().utf8().data());
+ startLocalLoad(*resourceLoader);
+ return;
+ }
+#endif
+
</ins><span class="cx"> LOG(NetworkScheduling, "(WebProcess) WebResourceLoadScheduler::scheduleLoad, url '%s' will be scheduled with the NetworkProcess with priority %u", resourceLoader->url().string().utf8().data(), resourceLoader->request().priority());
</span><span class="cx">
</span><span class="cx"> ContentSniffingPolicy contentSniffingPolicy = resourceLoader->shouldSniffContent() ? SniffContent : DoNotSniffContent;
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Tools/ChangeLog (195201 => 195202)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Tools/ChangeLog 2016-01-18 11:55:26 UTC (rev 195201)
+++ releases/WebKitGTK/webkit-2.10/Tools/ChangeLog 2016-01-18 12:05:46 UTC (rev 195202)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2016-01-01 Michael Catanzaro <mcatanzaro@igalia.com>
+
+ [SOUP] REGRESSION(r192761): Broke resource URIs for applications that use g_resource_load in a web extension
+ https://bugs.webkit.org/show_bug.cgi?id=152634
+
+ Reviewed by Carlos Garcia Campos.
+
+ * TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp:
+ (testLoadFromGResource): Added test.
+ (beforeAll):
+ * TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp:
+ (registerGResource): Added.
+ (webkit_web_extension_initialize_with_user_data): Load the test gresource.
+ * TestWebKitAPI/Tests/WebKit2Gtk/resources/boring.html: Added.
+ * TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml: Add an HTML file.
+
</ins><span class="cx"> 2015-12-21 Michael Catanzaro <mcatanzaro@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] jquery.min.js violates DFSG
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210ToolsTestWebKitAPITestsWebKit2GtkTestLoaderClientcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp (195201 => 195202)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp 2016-01-18 11:55:26 UTC (rev 195201)
+++ releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp 2016-01-18 12:05:46 UTC (rev 195202)
</span><span class="lines">@@ -116,6 +116,14 @@
</span><span class="cx"> assertNormalLoadHappened(test->m_loadEvents);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void testLoadFromGResource(LoadTrackingTest* test, gconstpointer)
+{
+ GRefPtr<WebKitURIRequest> request(webkit_uri_request_new("resource:///org/webkit/webkit2gtk/tests/boring.html"));
+ test->loadRequest(request.get());
+ test->waitUntilLoadFinished();
+ assertNormalLoadHappened(test->m_loadEvents);
+}
+
</ins><span class="cx"> class LoadStopTrackingTest : public LoadTrackingTest {
</span><span class="cx"> public:
</span><span class="cx"> MAKE_GLIB_TEST_FIXTURE(LoadStopTrackingTest);
</span><span class="lines">@@ -503,6 +511,7 @@
</span><span class="cx"> LoadTrackingTest::add("WebKitWebView", "load-plain-text", testLoadPlainText);
</span><span class="cx"> LoadTrackingTest::add("WebKitWebView", "load-bytes", testLoadBytes);
</span><span class="cx"> LoadTrackingTest::add("WebKitWebView", "load-request", testLoadRequest);
</span><ins>+ LoadTrackingTest::add("WebKitWebView", "load-gresource", testLoadFromGResource);
</ins><span class="cx"> LoadStopTrackingTest::add("WebKitWebView", "stop-loading", testLoadCancelled);
</span><span class="cx"> LoadTrackingTest::add("WebKitWebView", "title", testWebViewTitle);
</span><span class="cx"> LoadTrackingTest::add("WebKitWebView", "progress", testLoadProgress);
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210ToolsTestWebKitAPITestsWebKit2GtkWebExtensionTestcpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp (195201 => 195202)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2016-01-18 11:55:26 UTC (rev 195201)
+++ releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/WebExtensionTest.cpp 2016-01-18 12:05:46 UTC (rev 195202)
</span><span class="lines">@@ -354,11 +354,23 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void registerGResource(void)
+{
+ GUniquePtr<char> resourcesPath(g_build_filename(WEBKIT_EXEC_PATH, "TestWebKitAPI", "WebKit2Gtk", "resources", "webkit2gtk-tests-resources.gresource", nullptr));
+ GResource* resource = g_resource_load(resourcesPath.get(), nullptr);
+ g_assert(resource);
+
+ g_resources_register(resource);
+ g_resource_unref(resource);
+}
+
</ins><span class="cx"> extern "C" void webkit_web_extension_initialize_with_user_data(WebKitWebExtension* extension, GVariant* userData)
</span><span class="cx"> {
</span><span class="cx"> g_signal_connect(extension, "page-created", G_CALLBACK(pageCreatedCallback), extension);
</span><span class="cx"> g_signal_connect(webkit_script_world_get_default(), "window-object-cleared", G_CALLBACK(windowObjectCleared), 0);
</span><span class="cx">
</span><ins>+ registerGResource();
+
</ins><span class="cx"> g_assert(userData);
</span><span class="cx"> g_assert(g_variant_is_of_type(userData, G_VARIANT_TYPE_UINT32));
</span><span class="cx"> GUniquePtr<char> busName(g_strdup_printf("org.webkit.gtk.WebExtensionTest%u", g_variant_get_uint32(userData)));
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit210ToolsTestWebKitAPITestsWebKit2Gtkresourcesboringhtml"></a>
<div class="addfile"><h4>Added: releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/boring.html (0 => 195202)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/boring.html (rev 0)
+++ releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/boring.html 2016-01-18 12:05:46 UTC (rev 195202)
</span><span class="lines">@@ -0,0 +1 @@
</span><ins>+<p>This is a boring HTML file.</p>
</ins></span></pre></div>
<a id="releasesWebKitGTKwebkit210ToolsTestWebKitAPITestsWebKit2Gtkresourceswebkit2gtktestsgresourcexml"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml (195201 => 195202)</h4>
<pre class="diff"><span>
<span class="info">--- releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml 2016-01-18 11:55:26 UTC (rev 195201)
+++ releases/WebKitGTK/webkit-2.10/Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/webkit2gtk-tests.gresource.xml 2016-01-18 12:05:46 UTC (rev 195202)
</span><span class="lines">@@ -1,6 +1,7 @@
</span><span class="cx"> <?xml version="1.0" encoding="UTF-8"?>
</span><span class="cx"> <gresources>
</span><span class="cx"> <gresource prefix="/org/webkit/webkit2gtk/tests/">
</span><ins>+ <file alias="boring.html">Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/boring.html</file>
</ins><span class="cx"> <file alias="link-title.js">Tools/TestWebKitAPI/Tests/WebKit2Gtk/resources/link-title.js</file>
</span><span class="cx"> </gresource>
</span><span class="cx"> </gresources>
</span></span></pre>
</div>
</div>
</body>
</html>