<!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>[187185] 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/187185">187185</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-07-22 14:36:04 -0700 (Wed, 22 Jul 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: AppCache manifest 404 doesn't produce errors in console, manifest resource request always loading indicator
https://bugs.webkit.org/show_bug.cgi?id=147135
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-07-22
Reviewed by Alexey Proskuryakov.
Source/WebCore:
* loader/appcache/ApplicationCacheGroup.cpp:
(WebCore::ApplicationCacheGroup::didReceiveResponse):
Always pass a document loader instead of passing null for the manifest request.
(WebCore::ApplicationCacheGroup::didReceiveManifestResponse):
Since we will be cancelling the resource handle ourselves in didReceiveResponse
before receiving the didFail resource handle delegates, we should update the
inspector about this resource load failing due to a cancel.
(WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
(WebCore::ApplicationCacheGroup::checkIfLoadIsComplete):
Update the MessageSource from "Other" to "AppCache".
LayoutTests:
* http/tests/appcache/404-manifest-expected.txt:
* http/tests/appcache/abort-cache-ondownloading-manifest-404-expected.txt:
* http/tests/appcache/deferred-events-delete-while-raising-expected.txt:
* http/tests/appcache/deferred-events-delete-while-raising-timer-expected.txt:
* http/tests/appcache/deferred-events-expected.txt:
* http/tests/appcache/fail-on-update-2-expected.txt:
* http/tests/appcache/fail-on-update-expected.txt:
* http/tests/appcache/remove-cache-expected.txt:
Update with new Console errors about manifest 404s.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsappcache404manifestexpectedtxt">trunk/LayoutTests/http/tests/appcache/404-manifest-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheabortcacheondownloadingmanifest404expectedtxt">trunk/LayoutTests/http/tests/appcache/abort-cache-ondownloading-manifest-404-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachedeferredeventsdeletewhileraisingexpectedtxt">trunk/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachedeferredeventsdeletewhileraisingtimerexpectedtxt">trunk/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachedeferredeventsexpectedtxt">trunk/LayoutTests/http/tests/appcache/deferred-events-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachefailonupdate2expectedtxt">trunk/LayoutTests/http/tests/appcache/fail-on-update-2-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsappcachefailonupdateexpectedtxt">trunk/LayoutTests/http/tests/appcache/fail-on-update-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsappcacheremovecacheexpectedtxt">trunk/LayoutTests/http/tests/appcache/remove-cache-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp">trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/ChangeLog        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2015-07-22 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: AppCache manifest 404 doesn't produce errors in console, manifest resource request always loading indicator
+ https://bugs.webkit.org/show_bug.cgi?id=147135
+
+ Reviewed by Alexey Proskuryakov.
+
+ * http/tests/appcache/404-manifest-expected.txt:
+ * http/tests/appcache/abort-cache-ondownloading-manifest-404-expected.txt:
+ * http/tests/appcache/deferred-events-delete-while-raising-expected.txt:
+ * http/tests/appcache/deferred-events-delete-while-raising-timer-expected.txt:
+ * http/tests/appcache/deferred-events-expected.txt:
+ * http/tests/appcache/fail-on-update-2-expected.txt:
+ * http/tests/appcache/fail-on-update-expected.txt:
+ * http/tests/appcache/remove-cache-expected.txt:
+ Update with new Console errors about manifest 404s.
+
</ins><span class="cx"> 2015-07-22 Jinyoung Hur <hur.ims@navercorp.com>
</span><span class="cx">
</span><span class="cx"> [WinCairo] SVG path not rendered with all-zero dasharray
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcache404manifestexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/404-manifest-expected.txt (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/404-manifest-expected.txt        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/http/tests/appcache/404-manifest-expected.txt        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1,3 +1,4 @@
</span><ins>+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
</ins><span class="cx"> Test that subresources can be loaded if manifest is not available. Should say SUCCESS.
</span><span class="cx">
</span><span class="cx"> SUCCESS
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheabortcacheondownloadingmanifest404expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/abort-cache-ondownloading-manifest-404-expected.txt (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/abort-cache-ondownloading-manifest-404-expected.txt        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/http/tests/appcache/abort-cache-ondownloading-manifest-404-expected.txt        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1,2 +1,3 @@
</span><ins>+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
</ins><span class="cx"> This tests that download process was not aborted after downloading event since manifest was not found.
</span><span class="cx"> SUCCESS
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachedeferredeventsdeletewhileraisingexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-expected.txt (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-expected.txt        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-expected.txt        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
</ins><span class="cx"> Test the destruction of an iframe while deferred events are being raised does not crash the system.
</span><span class="cx">
</span><span class="cx"> SUCCESS
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachedeferredeventsdeletewhileraisingtimerexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer-expected.txt (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer-expected.txt        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/http/tests/appcache/deferred-events-delete-while-raising-timer-expected.txt        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
</ins><span class="cx"> Test the destruction of an iframe while deferred events are being raised does not crash the system.
</span><span class="cx">
</span><span class="cx"> SUCCESS
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachedeferredeventsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/deferred-events-expected.txt (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/deferred-events-expected.txt        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/http/tests/appcache/deferred-events-expected.txt        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1,2 +1,3 @@
</span><ins>+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
</ins><span class="cx"> Test that AppicationCache events are deferred until after onload has been fired.
</span><span class="cx"> SUCCESS
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachefailonupdate2expectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/fail-on-update-2-expected.txt (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/fail-on-update-2-expected.txt        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/http/tests/appcache/fail-on-update-2-expected.txt        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1 +1,2 @@
</span><ins>+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
</ins><span class="cx"> SUCCESS: No crash.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcachefailonupdateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/fail-on-update-expected.txt (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/fail-on-update-expected.txt        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/http/tests/appcache/fail-on-update-expected.txt        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1 +1,2 @@
</span><ins>+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
</ins><span class="cx"> SUCCESS: No crash.
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsappcacheremovecacheexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/appcache/remove-cache-expected.txt (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/appcache/remove-cache-expected.txt        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/LayoutTests/http/tests/appcache/remove-cache-expected.txt        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1,3 +1,5 @@
</span><ins>+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
+CONSOLE MESSAGE: Application Cache manifest could not be fetched, because the manifest had a 404 response.
</ins><span class="cx"> Test that a 404 response for manifest results in cache removal.
</span><span class="cx">
</span><span class="cx"> Frame 1: Manifest is still available, so a new master resource is added to the cache.
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/Source/WebCore/ChangeLog        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2015-07-22 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: AppCache manifest 404 doesn't produce errors in console, manifest resource request always loading indicator
+ https://bugs.webkit.org/show_bug.cgi?id=147135
+
+ Reviewed by Alexey Proskuryakov.
+
+ * loader/appcache/ApplicationCacheGroup.cpp:
+ (WebCore::ApplicationCacheGroup::didReceiveResponse):
+ Always pass a document loader instead of passing null for the manifest request.
+
+ (WebCore::ApplicationCacheGroup::didReceiveManifestResponse):
+ Since we will be cancelling the resource handle ourselves in didReceiveResponse
+ before receiving the didFail resource handle delegates, we should update the
+ inspector about this resource load failing due to a cancel.
+
+ (WebCore::ApplicationCacheGroup::didFinishLoadingManifest):
+ (WebCore::ApplicationCacheGroup::checkIfLoadIsComplete):
+ Update the MessageSource from "Other" to "AppCache".
+
</ins><span class="cx"> 2015-07-22 Jeremy Jones <jeremyj@apple.com>
</span><span class="cx">
</span><span class="cx"> Fix fullscreen and PiP video animation and sizing regressions.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderappcacheApplicationCacheGroupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp (187184 => 187185)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp        2015-07-22 21:31:40 UTC (rev 187184)
+++ trunk/Source/WebCore/loader/appcache/ApplicationCacheGroup.cpp        2015-07-22 21:36:04 UTC (rev 187185)
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> if (m_completionType != None)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- frame->document()->addConsoleMessage(MessageSource::Network, MessageLevel::Debug, ASCIILiteral("Application Cache download process was aborted."));
</del><ins>+ frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Debug, ASCIILiteral("Application Cache download process was aborted."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -491,9 +491,9 @@
</span><span class="cx">
</span><span class="cx"> void ApplicationCacheGroup::didReceiveResponse(ResourceHandle* handle, const ResourceResponse& response)
</span><span class="cx"> {
</span><del>- DocumentLoader* loader = (handle == m_manifestHandle) ? nullptr : m_frame->loader().documentLoader();
</del><ins>+ ASSERT(m_frame);
</ins><span class="cx"> InspectorInstrumentationCookie cookie = InspectorInstrumentation::willReceiveResourceResponse(m_frame);
</span><del>- InspectorInstrumentation::didReceiveResourceResponse(cookie, m_currentResourceIdentifier, loader, response, 0);
</del><ins>+ InspectorInstrumentation::didReceiveResourceResponse(cookie, m_currentResourceIdentifier, m_frame->loader().documentLoader(), response, 0);
</ins><span class="cx">
</span><span class="cx"> if (handle == m_manifestHandle) {
</span><span class="cx"> didReceiveManifestResponse(response);
</span><span class="lines">@@ -656,6 +656,8 @@
</span><span class="cx"> ASSERT(m_manifestHandle);
</span><span class="cx">
</span><span class="cx"> if (response.httpStatusCode() == 404 || response.httpStatusCode() == 410) {
</span><ins>+ InspectorInstrumentation::didFailLoading(m_frame, m_frame->loader().documentLoader(), m_currentResourceIdentifier, m_frame->loader().cancelledError(m_manifestHandle->firstRequest()));
+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, makeString("Application Cache manifest could not be fetched, because the manifest had a ", String::number(response.httpStatusCode()), " response."));
</ins><span class="cx"> manifestNotFound();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -664,13 +666,15 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (response.httpStatusCode() / 100 != 2) {
</span><del>- m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be fetched."));
</del><ins>+ InspectorInstrumentation::didFailLoading(m_frame, m_frame->loader().documentLoader(), m_currentResourceIdentifier, m_frame->loader().cancelledError(m_manifestHandle->firstRequest()));
+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, makeString("Application Cache manifest could not be fetched, because the manifest had a ", String::number(response.httpStatusCode()), " response."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (response.url() != m_manifestHandle->firstRequest().url()) {
</span><del>- m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be fetched, because a redirection was attempted."));
</del><ins>+ InspectorInstrumentation::didFailLoading(m_frame, m_frame->loader().documentLoader(), m_currentResourceIdentifier, m_frame->loader().cancelledError(m_manifestHandle->firstRequest()));
+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be fetched, because a redirection was attempted."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -690,7 +694,7 @@
</span><span class="cx">
</span><span class="cx"> if (!isUpgradeAttempt && !m_manifestResource) {
</span><span class="cx"> // The server returned 304 Not Modified even though we didn't send a conditional request.
</span><del>- m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be fetched because of an unexpected 304 Not Modified server response."));
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be fetched because of an unexpected 304 Not Modified server response."));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -716,7 +720,7 @@
</span><span class="cx"> Manifest manifest;
</span><span class="cx"> if (!parseManifest(m_manifestURL, m_manifestResource->data()->data(), m_manifestResource->data()->size(), manifest)) {
</span><span class="cx"> // At the time of this writing, lack of "CACHE MANIFEST" signature is the only reason for parseManifest to fail.
</span><del>- m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be parsed. Does it start with CACHE MANIFEST?"));
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, ASCIILiteral("Application Cache manifest could not be parsed. Does it start with CACHE MANIFEST?"));
</ins><span class="cx"> cacheUpdateFailed();
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -905,7 +909,7 @@
</span><span class="cx"> // We ran out of space for this origin. Fall down to the normal error handling
</span><span class="cx"> // after recording this state.
</span><span class="cx"> m_originQuotaExceededPreviously = true;
</span><del>- m_frame->document()->addConsoleMessage(MessageSource::Other, MessageLevel::Error, ASCIILiteral("Application Cache update failed, because size quota was exceeded."));
</del><ins>+ m_frame->document()->addConsoleMessage(MessageSource::AppCache, MessageLevel::Error, ASCIILiteral("Application Cache update failed, because size quota was exceeded."));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (failureReason == ApplicationCacheStorage::TotalQuotaReached && !m_calledReachedMaxAppCacheSize) {
</span></span></pre>
</div>
</div>
</body>
</html>