<!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>[198532] trunk/Source</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/198532">198532</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-03-22 10:26:03 -0700 (Tue, 22 Mar 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] WebInspector broken after <a href="http://trac.webkit.org/projects/webkit/changeset/197620">r197620</a>
https://bugs.webkit.org/show_bug.cgi?id=155497
<rdar://problem/25171910>
Patch by Carlos Garcia Campos <cgarcia@igalia.com> on 2016-03-22
Reviewed by Philippe Normand.
Source/WebCore:
Add resource scheme to the list of secure protocols.
* platform/SchemeRegistry.cpp:
(WebCore::secureSchemes):
Source/WebKit2:
Stop registering resource:// URLs as local, because they are not
like a local file at all. Compare also the URL protocols when
checking whether requested URL is main or test inspector page
instead of checking that the protocol is registered as local.
* UIProcess/WebInspectorProxy.cpp:
(WebKit::isMainOrTestInspectorPage): Compare also the URL protocols.
* UIProcess/WebInspectorProxy.h:
* UIProcess/gtk/WebInspectorProxyGtk.cpp:
(WebKit::WebInspectorProxy::platformCreateInspectorPage): Do not
set setAllowFileAccessFromFileURLs setting to true.
* UIProcess/gtk/WebProcessPoolGtk.cpp:
(WebKit::WebProcessPool::platformInitializeWebProcess): Do not
register resource:// URLS as local.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformSchemeRegistrycpp">trunk/Source/WebCore/platform/SchemeRegistry.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebInspectorProxycpp">trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp">trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (198531 => 198532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-03-22 17:01:04 UTC (rev 198531)
+++ trunk/Source/WebCore/ChangeLog 2016-03-22 17:26:03 UTC (rev 198532)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2016-03-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] WebInspector broken after r197620
+ https://bugs.webkit.org/show_bug.cgi?id=155497
+ <rdar://problem/25171910>
+
+ Reviewed by Philippe Normand.
+
+ Add resource scheme to the list of secure protocols.
+
+ * platform/SchemeRegistry.cpp:
+ (WebCore::secureSchemes):
+
</ins><span class="cx"> 2016-03-22 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> SharedBuffer::copy() can cause a segmentation fault.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformSchemeRegistrycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/SchemeRegistry.cpp (198531 => 198532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/SchemeRegistry.cpp 2016-03-22 17:01:04 UTC (rev 198531)
+++ trunk/Source/WebCore/platform/SchemeRegistry.cpp 2016-03-22 17:26:03 UTC (rev 198532)
</span><span class="lines">@@ -66,6 +66,9 @@
</span><span class="cx"> #if USE(QUICK_LOOK)
</span><span class="cx"> secureSchemes.get().add(QLPreviewProtocol());
</span><span class="cx"> #endif
</span><ins>+#if PLATFORM(GTK)
+ secureSchemes.get().add("resource");
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return secureSchemes;
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (198531 => 198532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-03-22 17:01:04 UTC (rev 198531)
+++ trunk/Source/WebKit2/ChangeLog 2016-03-22 17:26:03 UTC (rev 198532)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2016-03-22 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] WebInspector broken after r197620
+ https://bugs.webkit.org/show_bug.cgi?id=155497
+ <rdar://problem/25171910>
+
+ Reviewed by Philippe Normand.
+
+ Stop registering resource:// URLs as local, because they are not
+ like a local file at all. Compare also the URL protocols when
+ checking whether requested URL is main or test inspector page
+ instead of checking that the protocol is registered as local.
+
+ * UIProcess/WebInspectorProxy.cpp:
+ (WebKit::isMainOrTestInspectorPage): Compare also the URL protocols.
+ * UIProcess/WebInspectorProxy.h:
+ * UIProcess/gtk/WebInspectorProxyGtk.cpp:
+ (WebKit::WebInspectorProxy::platformCreateInspectorPage): Do not
+ set setAllowFileAccessFromFileURLs setting to true.
+ * UIProcess/gtk/WebProcessPoolGtk.cpp:
+ (WebKit::WebProcessPool::platformInitializeWebProcess): Do not
+ register resource:// URLS as local.
+
</ins><span class="cx"> 2016-03-22 Alberto Garcia <berto@igalia.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed typo fixes.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebInspectorProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp (198531 => 198532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-03-22 17:01:04 UTC (rev 198531)
+++ trunk/Source/WebKit2/UIProcess/WebInspectorProxy.cpp 2016-03-22 17:26:03 UTC (rev 198532)
</span><span class="lines">@@ -43,7 +43,6 @@
</span><span class="cx"> #include "WebProcessPool.h"
</span><span class="cx"> #include "WebProcessProxy.h"
</span><span class="cx"> #include <WebCore/NotImplemented.h>
</span><del>-#include <WebCore/SchemeRegistry.h>
</del><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR_SERVER)
</span><span class="lines">@@ -332,14 +331,10 @@
</span><span class="cx">
</span><span class="cx"> static bool isMainOrTestInspectorPage(WKURLRequestRef requestRef)
</span><span class="cx"> {
</span><del>- URL requestURL(URL(), toImpl(requestRef)->resourceRequest().url());
- if (!WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(requestURL.protocol()))
- return false;
-
- // Use URL so we can compare just the paths.
</del><ins>+ // Use URL so we can compare the paths and protocols.
+ const URL& requestURL = toImpl(requestRef)->resourceRequest().url();
</ins><span class="cx"> URL mainPageURL(URL(), WebInspectorProxy::inspectorPageURL());
</span><del>- ASSERT(WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(mainPageURL.protocol()));
- if (decodeURLEscapeSequences(requestURL.path()) == decodeURLEscapeSequences(mainPageURL.path()))
</del><ins>+ if (requestURL.protocol() == mainPageURL.protocol() && decodeURLEscapeSequences(requestURL.path()) == decodeURLEscapeSequences(mainPageURL.path()))
</ins><span class="cx"> return true;
</span><span class="cx">
</span><span class="cx"> // We might not have a Test URL in Production builds.
</span><span class="lines">@@ -348,8 +343,7 @@
</span><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> URL testPageURL(URL(), testPageURLString);
</span><del>- ASSERT(WebCore::SchemeRegistry::shouldTreatURLSchemeAsLocal(testPageURL.protocol()));
- return decodeURLEscapeSequences(requestURL.path()) == decodeURLEscapeSequences(testPageURL.path());
</del><ins>+ return requestURL.protocol() == testPageURL.protocol() && decodeURLEscapeSequences(requestURL.path()) == decodeURLEscapeSequences(testPageURL.path());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void processDidCrash(WKPageRef, const void* clientInfo)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebInspectorProxyGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp (198531 => 198532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2016-03-22 17:01:04 UTC (rev 198531)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebInspectorProxyGtk.cpp 2016-03-22 17:26:03 UTC (rev 198532)
</span><span class="lines">@@ -74,7 +74,6 @@
</span><span class="cx"> preferences->setDeveloperExtrasEnabled(true);
</span><span class="cx"> preferences->setLogsPageMessagesToSystemConsoleEnabled(true);
</span><span class="cx"> #endif
</span><del>- preferences->setAllowFileAccessFromFileURLs(true);
</del><span class="cx"> preferences->setJavaScriptRuntimeFlags({
</span><span class="cx"> });
</span><span class="cx"> RefPtr<WebPageGroup> pageGroup = WebPageGroup::create(inspectorPageGroupIdentifier(), false, false);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessgtkWebProcessPoolGtkcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp (198531 => 198532)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2016-03-22 17:01:04 UTC (rev 198531)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebProcessPoolGtk.cpp 2016-03-22 17:26:03 UTC (rev 198532)
</span><span class="lines">@@ -89,12 +89,6 @@
</span><span class="cx"> void WebProcessPool::platformInitializeWebProcess(WebProcessCreationParameters& parameters)
</span><span class="cx"> {
</span><span class="cx"> initInspectorServer();
</span><del>-
- if (!parameters.urlSchemesRegisteredAsLocal.contains("resource")) {
- WebCore::SchemeRegistry::registerURLSchemeAsLocal("resource");
- parameters.urlSchemesRegisteredAsLocal.append("resource");
- }
-
</del><span class="cx"> parameters.memoryCacheDisabled = m_memoryCacheDisabled || cacheModel() == CacheModelDocumentViewer;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>