<!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>[193349] branches/safari-601-branch</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/193349">193349</a></dd>
<dt>Author</dt> <dd>timothy@apple.com</dd>
<dt>Date</dt> <dd>2015-12-03 11:13:16 -0800 (Thu, 03 Dec 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/192592">r192592</a>. rdar://problem/23221163</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari601branchLayoutTestsChangeLog">branches/safari-601-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreChangeLog">branches/safari-601-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari601branchSourceWebCoreinspectorInspectorPageAgentcpp">branches/safari-601-branch/Source/WebCore/inspector/InspectorPageAgent.cpp</a></li>
<li><a href="#branchessafari601branchSourceWebCoreloadercacheCachedResourceLoadercpp">branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>branches/safari-601-branch/LayoutTests/inspector/network/</li>
<li><a href="#branchessafari601branchLayoutTestsinspectornetworkclientblockedloadexpectedtxt">branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load-expected.txt</a></li>
<li><a href="#branchessafari601branchLayoutTestsinspectornetworkclientblockedloadhtml">branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari601branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/LayoutTests/ChangeLog (193348 => 193349)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 19:13:09 UTC (rev 193348)
+++ branches/safari-601-branch/LayoutTests/ChangeLog 2015-12-03 19:13:16 UTC (rev 193349)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192592. rdar://problem/23221163
+
+ 2015-11-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Client Blocked Resource Requests causes Crash under InspectorPageAgent::cachedResource
+ https://bugs.webkit.org/show_bug.cgi?id=151398
+
+ Reviewed by Brian Burg.
+
+ * inspector/network/client-blocked-load-expected.txt: Added.
+ * inspector/network/client-blocked-load.html: Added.
+
+2015-12-03 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r186891. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-07-16 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectornetworkclientblockedloadexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load-expected.txt (0 => 193349)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load-expected.txt (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load-expected.txt 2015-12-03 19:13:16 UTC (rev 193349)
</span><span class="lines">@@ -0,0 +1,9 @@
</span><ins>+Tests that there is no crash when the client blocks a resource load.
+
+
+== Running test suite: ClientBlockedResourceLoad
+-- Running test case: TriggerBlockedResourceLoad
+PASS: Resource should be created.
+PASS: Request url should be rewritten to the null string.
+PASS: Resource load should fail.
+
</ins></span></pre></div>
<a id="branchessafari601branchLayoutTestsinspectornetworkclientblockedloadhtml"></a>
<div class="addfile"><h4>Added: branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load.html (0 => 193349)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load.html (rev 0)
+++ branches/safari-601-branch/LayoutTests/inspector/network/client-blocked-load.html 2015-12-03 19:13:16 UTC (rev 193349)
</span><span class="lines">@@ -0,0 +1,42 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function createBlockedResourceLoad() {
+ testRunner.setWillSendRequestReturnsNull(true);
+
+ let img = document.createElement("img");
+ img.src = "does-not-exist.png";
+ document.body.appendChild(img);
+}
+
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("ClientBlockedResourceLoad");
+
+ suite.addTestCase({
+ name: "TriggerBlockedResourceLoad",
+ description: "Trigger a blocked resource load and ensure we get notified of the request.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("createBlockedResourceLoad()");
+ WebInspector.Frame.singleFireEventListener(WebInspector.Frame.Event.ResourceWasAdded, (event) => {
+ let resource = event.data.resource;
+ InspectorTest.expectThat(resource instanceof WebInspector.Resource, "Resource should be created.");
+ InspectorTest.expectThat(resource.url === "", "Request url should be rewritten to the null string.");
+ resource.singleFireEventListener(WebInspector.Resource.Event.LoadingDidFail, (event) => {
+ InspectorTest.expectThat(true, "Resource load should fail.");
+ resolve();
+ });
+ });
+ }
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onload="runTest()">
+<p>Tests that there is no crash when the client blocks a resource load.</p>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari601branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/ChangeLog (193348 => 193349)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-03 19:13:09 UTC (rev 193348)
+++ branches/safari-601-branch/Source/WebCore/ChangeLog 2015-12-03 19:13:16 UTC (rev 193349)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2015-12-03 Timothy Hatcher <timothy@apple.com>
</span><span class="cx">
</span><ins>+ Merge r192592. rdar://problem/23221163
+
+ 2015-11-18 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Client Blocked Resource Requests causes Crash under InspectorPageAgent::cachedResource
+ https://bugs.webkit.org/show_bug.cgi?id=151398
+
+ Reviewed by Brian Burg.
+
+ Test: inspector/network/client-blocked-load.html
+
+ * inspector/InspectorPageAgent.cpp:
+ (WebCore::InspectorPageAgent::cachedResource):
+ Gracefully handle null request.
+
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::cachedResource):
+ ASSERT if someone tried to pass a null URL.
+
+2015-12-03 Timothy Hatcher <timothy@apple.com>
+
</ins><span class="cx"> Merge r192585. rdar://problem/23221163
</span><span class="cx">
</span><span class="cx"> 2015-11-18 Joseph Pecoraro <pecoraro@apple.com>
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreinspectorInspectorPageAgentcpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/inspector/InspectorPageAgent.cpp (193348 => 193349)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-12-03 19:13:09 UTC (rev 193348)
+++ branches/safari-601-branch/Source/WebCore/inspector/InspectorPageAgent.cpp 2015-12-03 19:13:16 UTC (rev 193349)
</span><span class="lines">@@ -258,6 +258,9 @@
</span><span class="cx">
</span><span class="cx"> CachedResource* InspectorPageAgent::cachedResource(Frame* frame, const URL& url)
</span><span class="cx"> {
</span><ins>+ if (url.isNull())
+ return nullptr;
+
</ins><span class="cx"> CachedResource* cachedResource = frame->document()->cachedResourceLoader().cachedResource(url);
</span><span class="cx"> if (!cachedResource) {
</span><span class="cx"> ResourceRequest request(url);
</span></span></pre></div>
<a id="branchessafari601branchSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp (193348 => 193349)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-12-03 19:13:09 UTC (rev 193348)
+++ branches/safari-601-branch/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2015-12-03 19:13:16 UTC (rev 193349)
</span><span class="lines">@@ -148,6 +148,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResource* CachedResourceLoader::cachedResource(const String& resourceURL) const
</span><span class="cx"> {
</span><ins>+ ASSERT(!resourceURL.isNull());
</ins><span class="cx"> URL url = m_document->completeURL(resourceURL);
</span><span class="cx"> return cachedResource(url);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>