<!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>[163718] trunk/Source/WebCore</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/163718">163718</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-02-08 12:02:40 -0800 (Sat, 08 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Slight CTTE in PingLoader
https://bugs.webkit.org/show_bug.cgi?id=128462
Reviewed by Dan Bernstein.
PingLoader always wants a non-null frame.
* html/HTMLAnchorElement.cpp:
(WebCore::HTMLAnchorElement::sendPings):
* html/parser/XSSAuditorDelegate.cpp:
(WebCore::XSSAuditorDelegate::didBlockScript):
* inspector/InspectorInstrumentation.h:
(WebCore::InspectorInstrumentation::continueAfterPingLoader):
* loader/PingLoader.cpp:
(WebCore::PingLoader::loadImage):
(WebCore::PingLoader::sendPing):
(WebCore::PingLoader::sendViolationReport):
(WebCore::PingLoader::createPingLoader):
(WebCore::PingLoader::PingLoader):
* loader/PingLoader.h:
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::requestImage):
* page/ContentSecurityPolicy.cpp:
(WebCore::ContentSecurityPolicy::reportViolation):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLAnchorElementcpp">trunk/Source/WebCore/html/HTMLAnchorElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlparserXSSAuditorDelegatecpp">trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorInstrumentationh">trunk/Source/WebCore/inspector/InspectorInstrumentation.h</a></li>
<li><a href="#trunkSourceWebCoreloaderPingLoadercpp">trunk/Source/WebCore/loader/PingLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderPingLoaderh">trunk/Source/WebCore/loader/PingLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorepageContentSecurityPolicycpp">trunk/Source/WebCore/page/ContentSecurityPolicy.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (163717 => 163718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-02-08 19:58:21 UTC (rev 163717)
+++ trunk/Source/WebCore/ChangeLog 2014-02-08 20:02:40 UTC (rev 163718)
</span><span class="lines">@@ -1,3 +1,30 @@
</span><ins>+2014-02-08 Anders Carlsson <andersca@apple.com>
+
+ Slight CTTE in PingLoader
+ https://bugs.webkit.org/show_bug.cgi?id=128462
+
+ Reviewed by Dan Bernstein.
+
+ PingLoader always wants a non-null frame.
+
+ * html/HTMLAnchorElement.cpp:
+ (WebCore::HTMLAnchorElement::sendPings):
+ * html/parser/XSSAuditorDelegate.cpp:
+ (WebCore::XSSAuditorDelegate::didBlockScript):
+ * inspector/InspectorInstrumentation.h:
+ (WebCore::InspectorInstrumentation::continueAfterPingLoader):
+ * loader/PingLoader.cpp:
+ (WebCore::PingLoader::loadImage):
+ (WebCore::PingLoader::sendPing):
+ (WebCore::PingLoader::sendViolationReport):
+ (WebCore::PingLoader::createPingLoader):
+ (WebCore::PingLoader::PingLoader):
+ * loader/PingLoader.h:
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::requestImage):
+ * page/ContentSecurityPolicy.cpp:
+ (WebCore::ContentSecurityPolicy::reportViolation):
+
</ins><span class="cx"> 2014-02-08 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove client-drawn highlights (-webkit-highlight, WebHTMLHighlighter)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLAnchorElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLAnchorElement.cpp (163717 => 163718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-02-08 19:58:21 UTC (rev 163717)
+++ trunk/Source/WebCore/html/HTMLAnchorElement.cpp 2014-02-08 20:02:40 UTC (rev 163718)
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx">
</span><span class="cx"> SpaceSplitString pingURLs(getAttribute(pingAttr), false);
</span><span class="cx"> for (unsigned i = 0; i < pingURLs.size(); i++)
</span><del>- PingLoader::sendPing(document().frame(), document().completeURL(pingURLs[i]), destinationURL);
</del><ins>+ PingLoader::sendPing(*document().frame(), document().completeURL(pingURLs[i]), destinationURL);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLAnchorElement::handleClick(Event* event)
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlparserXSSAuditorDelegatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp (163717 => 163718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp 2014-02-08 19:58:21 UTC (rev 163717)
+++ trunk/Source/WebCore/html/parser/XSSAuditorDelegate.cpp 2014-02-08 20:02:40 UTC (rev 163718)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> frameLoader.client().didDetectXSS(m_document.url(), xssInfo.m_didBlockEntirePage);
</span><span class="cx">
</span><span class="cx"> if (!m_reportURL.isEmpty())
</span><del>- PingLoader::sendViolationReport(m_document.frame(), m_reportURL, generateViolationReport());
</del><ins>+ PingLoader::sendViolationReport(*m_document.frame(), m_reportURL, generateViolationReport());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (xssInfo.m_didBlockEntirePage)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorInstrumentationh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorInstrumentation.h (163717 => 163718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-02-08 19:58:21 UTC (rev 163717)
+++ trunk/Source/WebCore/inspector/InspectorInstrumentation.h 2014-02-08 20:02:40 UTC (rev 163718)
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx">
</span><span class="cx"> static void applyEmulatedMedia(Frame*, String*);
</span><span class="cx"> static void willSendRequest(Frame*, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse& redirectResponse);
</span><del>- static void continueAfterPingLoader(Frame*, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse&);
</del><ins>+ static void continueAfterPingLoader(Frame&, unsigned long identifier, DocumentLoader*, ResourceRequest&, const ResourceResponse&);
</ins><span class="cx"> static void markResourceAsCached(Page*, unsigned long identifier);
</span><span class="cx"> static void didLoadResourceFromMemoryCache(Page*, DocumentLoader*, CachedResource*);
</span><span class="cx"> static InspectorInstrumentationCookie willReceiveResourceData(Frame*, unsigned long identifier, int length);
</span><span class="lines">@@ -1186,10 +1186,10 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-inline void InspectorInstrumentation::continueAfterPingLoader(Frame* frame, unsigned long identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& response)
</del><ins>+inline void InspectorInstrumentation::continueAfterPingLoader(Frame& frame, unsigned long identifier, DocumentLoader* loader, ResourceRequest& request, const ResourceResponse& response)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><del>- if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(frame))
</del><ins>+ if (InstrumentingAgents* instrumentingAgents = instrumentingAgentsForFrame(&frame))
</ins><span class="cx"> InspectorInstrumentation::continueAfterPingLoaderImpl(instrumentingAgents, identifier, loader, request, response);
</span><span class="cx"> #else
</span><span class="cx"> UNUSED_PARAM(frame);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPingLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PingLoader.cpp (163717 => 163718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PingLoader.cpp 2014-02-08 19:58:21 UTC (rev 163717)
+++ trunk/Source/WebCore/loader/PingLoader.cpp 2014-02-08 20:02:40 UTC (rev 163718)
</span><span class="lines">@@ -49,41 +49,41 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-void PingLoader::loadImage(Frame* frame, const URL& url)
</del><ins>+void PingLoader::loadImage(Frame& frame, const URL& url)
</ins><span class="cx"> {
</span><del>- if (!frame->document()->securityOrigin()->canDisplay(url)) {
- FrameLoader::reportLocalLoadFailed(frame, url);
</del><ins>+ if (!frame.document()->securityOrigin()->canDisplay(url)) {
+ FrameLoader::reportLocalLoadFailed(&frame, url);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceRequest request(url);
</span><span class="cx"> request.setHTTPHeaderField("Cache-Control", "max-age=0");
</span><del>- String referrer = SecurityPolicy::generateReferrerHeader(frame->document()->referrerPolicy(), request.url(), frame->loader().outgoingReferrer());
</del><ins>+ String referrer = SecurityPolicy::generateReferrerHeader(frame.document()->referrerPolicy(), request.url(), frame.loader().outgoingReferrer());
</ins><span class="cx"> if (!referrer.isEmpty())
</span><span class="cx"> request.setHTTPReferrer(referrer);
</span><del>- frame->loader().addExtraFieldsToSubresourceRequest(request);
</del><ins>+ frame.loader().addExtraFieldsToSubresourceRequest(request);
</ins><span class="cx">
</span><span class="cx"> createPingLoader(frame, request);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // http://www.whatwg.org/specs/web-apps/current-work/multipage/links.html#hyperlink-auditing
</span><del>-void PingLoader::sendPing(Frame* frame, const URL& pingURL, const URL& destinationURL)
</del><ins>+void PingLoader::sendPing(Frame& frame, const URL& pingURL, const URL& destinationURL)
</ins><span class="cx"> {
</span><span class="cx"> ResourceRequest request(pingURL);
</span><span class="cx"> request.setHTTPMethod("POST");
</span><span class="cx"> request.setHTTPContentType("text/ping");
</span><span class="cx"> request.setHTTPBody(FormData::create("PING"));
</span><span class="cx"> request.setHTTPHeaderField("Cache-Control", "max-age=0");
</span><del>- frame->loader().addExtraFieldsToSubresourceRequest(request);
</del><ins>+ frame.loader().addExtraFieldsToSubresourceRequest(request);
</ins><span class="cx">
</span><del>- SecurityOrigin* sourceOrigin = frame->document()->securityOrigin();
</del><ins>+ SecurityOrigin* sourceOrigin = frame.document()->securityOrigin();
</ins><span class="cx"> RefPtr<SecurityOrigin> pingOrigin = SecurityOrigin::create(pingURL);
</span><span class="cx"> FrameLoader::addHTTPOriginIfNeeded(request, sourceOrigin->toString());
</span><span class="cx"> request.setHTTPHeaderField("Ping-To", destinationURL);
</span><del>- if (!SecurityPolicy::shouldHideReferrer(pingURL, frame->loader().outgoingReferrer())) {
- request.setHTTPHeaderField("Ping-From", frame->document()->url());
</del><ins>+ if (!SecurityPolicy::shouldHideReferrer(pingURL, frame.loader().outgoingReferrer())) {
+ request.setHTTPHeaderField("Ping-From", frame.document()->url());
</ins><span class="cx"> if (!sourceOrigin->isSameSchemeHostPort(pingOrigin.get())) {
</span><del>- String referrer = SecurityPolicy::generateReferrerHeader(frame->document()->referrerPolicy(), pingURL, frame->loader().outgoingReferrer());
</del><ins>+ String referrer = SecurityPolicy::generateReferrerHeader(frame.document()->referrerPolicy(), pingURL, frame.loader().outgoingReferrer());
</ins><span class="cx"> if (!referrer.isEmpty())
</span><span class="cx"> request.setHTTPReferrer(referrer);
</span><span class="cx"> }
</span><span class="lines">@@ -92,40 +92,40 @@
</span><span class="cx"> createPingLoader(frame, request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PingLoader::sendViolationReport(Frame* frame, const URL& reportURL, PassRefPtr<FormData> report)
</del><ins>+void PingLoader::sendViolationReport(Frame& frame, const URL& reportURL, PassRefPtr<FormData> report)
</ins><span class="cx"> {
</span><span class="cx"> ResourceRequest request(reportURL);
</span><span class="cx"> request.setHTTPMethod("POST");
</span><span class="cx"> request.setHTTPContentType("application/json");
</span><span class="cx"> request.setHTTPBody(report);
</span><del>- frame->loader().addExtraFieldsToSubresourceRequest(request);
</del><ins>+ frame.loader().addExtraFieldsToSubresourceRequest(request);
</ins><span class="cx">
</span><del>- String referrer = SecurityPolicy::generateReferrerHeader(frame->document()->referrerPolicy(), reportURL, frame->loader().outgoingReferrer());
</del><ins>+ String referrer = SecurityPolicy::generateReferrerHeader(frame.document()->referrerPolicy(), reportURL, frame.loader().outgoingReferrer());
</ins><span class="cx"> if (!referrer.isEmpty())
</span><span class="cx"> request.setHTTPReferrer(referrer);
</span><span class="cx">
</span><span class="cx"> createPingLoader(frame, request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void PingLoader::createPingLoader(Frame* frame, ResourceRequest& request)
</del><ins>+void PingLoader::createPingLoader(Frame& frame, ResourceRequest& request)
</ins><span class="cx"> {
</span><span class="cx"> // No need to free the PingLoader object or manage it via a smart pointer - it will kill itself as soon as it receives a response.
</span><span class="cx"> new PingLoader(frame, request);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-PingLoader::PingLoader(Frame* frame, ResourceRequest& request)
</del><ins>+PingLoader::PingLoader(Frame& frame, ResourceRequest& request)
</ins><span class="cx"> : m_timeout(this, &PingLoader::timeoutTimerFired)
</span><span class="cx"> {
</span><del>- unsigned long identifier = frame->page()->progress().createUniqueIdentifier();
</del><ins>+ unsigned long identifier = frame.page()->progress().createUniqueIdentifier();
</ins><span class="cx"> // FIXME: Why activeDocumentLoader? I would have expected documentLoader().
</span><span class="cx"> // Itseems like the PingLoader should be associated with the current
</span><span class="cx"> // Document in the Frame, but the activeDocumentLoader will be associated
</span><span class="cx"> // with the provisional DocumentLoader if there is a provisional
</span><span class="cx"> // DocumentLoader.
</span><del>- m_shouldUseCredentialStorage = frame->loader().client().shouldUseCredentialStorage(frame->loader().activeDocumentLoader(), identifier);
- m_handle = ResourceHandle::create(frame->loader().networkingContext(), request, this, false, false);
</del><ins>+ m_shouldUseCredentialStorage = frame.loader().client().shouldUseCredentialStorage(frame.loader().activeDocumentLoader(), identifier);
+ m_handle = ResourceHandle::create(frame.loader().networkingContext(), request, this, false, false);
</ins><span class="cx">
</span><del>- InspectorInstrumentation::continueAfterPingLoader(frame, identifier, frame->loader().activeDocumentLoader(), request, ResourceResponse());
</del><ins>+ InspectorInstrumentation::continueAfterPingLoader(frame, identifier, frame.loader().activeDocumentLoader(), request, ResourceResponse());
</ins><span class="cx">
</span><span class="cx"> // If the server never responds, FrameLoader won't be able to cancel this load and
</span><span class="cx"> // we'll sit here waiting forever. Set a very generous timeout, just in case.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderPingLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/PingLoader.h (163717 => 163718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/PingLoader.h 2014-02-08 19:58:21 UTC (rev 163717)
+++ trunk/Source/WebCore/loader/PingLoader.h 2014-02-08 20:02:40 UTC (rev 163718)
</span><span class="lines">@@ -54,15 +54,15 @@
</span><span class="cx"> class PingLoader : private ResourceHandleClient {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(PingLoader); WTF_MAKE_FAST_ALLOCATED;
</span><span class="cx"> public:
</span><del>- static void loadImage(Frame*, const URL& url);
- static void sendPing(Frame*, const URL& pingURL, const URL& destinationURL);
- static void sendViolationReport(Frame*, const URL& reportURL, PassRefPtr<FormData> report);
</del><ins>+ static void loadImage(Frame&, const URL&);
+ static void sendPing(Frame&, const URL& pingURL, const URL& destinationURL);
+ static void sendViolationReport(Frame&, const URL& reportURL, PassRefPtr<FormData> report);
</ins><span class="cx">
</span><span class="cx"> virtual ~PingLoader();
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- static void createPingLoader(Frame*, ResourceRequest&);
- PingLoader(Frame*, ResourceRequest&);
</del><ins>+ static void createPingLoader(Frame&, ResourceRequest&);
+ PingLoader(Frame&, ResourceRequest&);
</ins><span class="cx">
</span><span class="cx"> virtual void didReceiveResponse(ResourceHandle*, const ResourceResponse&) override { delete this; }
</span><span class="cx"> virtual void didReceiveData(ResourceHandle*, const char*, unsigned, int) override { delete this; }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (163717 => 163718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-02-08 19:58:21 UTC (rev 163717)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-02-08 20:02:40 UTC (rev 163718)
</span><span class="lines">@@ -149,14 +149,15 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceHandle<CachedImage> CachedResourceLoader::requestImage(CachedResourceRequest& request)
</span><span class="cx"> {
</span><del>- if (Frame* f = frame()) {
- if (f->loader().pageDismissalEventBeingDispatched() != FrameLoader::NoDismissal) {
</del><ins>+ if (Frame* frame = this->frame()) {
+ if (frame->loader().pageDismissalEventBeingDispatched() != FrameLoader::NoDismissal) {
</ins><span class="cx"> URL requestURL = request.resourceRequest().url();
</span><span class="cx"> if (requestURL.isValid() && canRequest(CachedResource::ImageResource, requestURL, request.options(), request.forPreload()))
</span><del>- PingLoader::loadImage(f, requestURL);
- return 0;
</del><ins>+ PingLoader::loadImage(*frame, requestURL);
+ return nullptr;
</ins><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> request.setDefer(clientDefersImage(request.resourceRequest().url()) ? CachedResourceRequest::DeferredByClient : CachedResourceRequest::NoDefer);
</span><span class="cx"> return toCachedImage(requestResource(CachedResource::ImageResource, request).get());
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageContentSecurityPolicycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContentSecurityPolicy.cpp (163717 => 163718)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-02-08 19:58:21 UTC (rev 163717)
+++ trunk/Source/WebCore/page/ContentSecurityPolicy.cpp 2014-02-08 20:02:40 UTC (rev 163718)
</span><span class="lines">@@ -1805,8 +1805,8 @@
</span><span class="cx">
</span><span class="cx"> RefPtr<FormData> report = FormData::create(reportObject->toJSONString().utf8());
</span><span class="cx">
</span><del>- for (size_t i = 0; i < reportURIs.size(); ++i)
- PingLoader::sendViolationReport(frame, reportURIs[i], report);
</del><ins>+ for (const auto& url : reportURIs)
+ PingLoader::sendViolationReport(*frame, url, report);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ContentSecurityPolicy::reportUnsupportedDirective(const String& name) const
</span></span></pre>
</div>
</div>
</body>
</html>