<!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>[204014] 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/204014">204014</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-01 23:46:57 -0700 (Mon, 01 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] Pass directly FetchRequest fetch options to ThreadableLoader
https://bugs.webkit.org/show_bug.cgi?id=160407
Patch by Youenn Fablet <youenn@apple.com> on 2016-08-01
Reviewed by Sam Weinig.
No change of behavior.
Added a ResourceLoaderOptions constructor that takes a FetchOptions as input.
Removed setters and getters of ResourceLoaderOptions as it is a struct.
Updated member fields accordingly.
Updated code accordingly.
Removed explicit option setting if it is the same as the default value.
* Modules/fetch/FetchLoader.cpp:
(WebCore::FetchLoader::start):
* css/CSSFontFaceSrcValue.cpp:
(WebCore::CSSFontFaceSrcValue::cachedFont):
* css/CSSImageSetValue.cpp:
(WebCore::CSSImageSetValue::cachedImageSet):
* css/CSSImageValue.cpp:
(WebCore::CSSImageValue::cachedImage):
* dom/ScriptElement.cpp:
(WebCore::ScriptElement::requestScript):
* fileapi/FileReaderLoader.cpp:
(WebCore::FileReaderLoader::start):
* html/HTMLLinkElement.cpp:
(WebCore::HTMLLinkElement::process):
* inspector/InspectorNetworkAgent.cpp:
(WebCore::InspectorNetworkAgent::loadResource):
* loader/CrossOriginPreflightChecker.cpp:
(WebCore::CrossOriginPreflightChecker::validatePreflightResponse):
(WebCore::CrossOriginPreflightChecker::startPreflight):
* loader/DocumentThreadableLoader.cpp:
(WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
(WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequest):
(WebCore::DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest):
(WebCore::DocumentThreadableLoader::redirectReceived):
(WebCore::DocumentThreadableLoader::didReceiveResponse):
(WebCore::DocumentThreadableLoader::preflightSuccess):
(WebCore::DocumentThreadableLoader::loadRequest):
* loader/ImageLoader.cpp:
(WebCore::ImageLoader::updateFromElement):
* loader/ResourceLoader.cpp:
(WebCore::ResourceLoader::ResourceLoader):
(WebCore::ResourceLoader::init):
(WebCore::ResourceLoader::start):
(WebCore::ResourceLoader::setDefersLoading):
(WebCore::ResourceLoader::setDataBufferingPolicy):
(WebCore::ResourceLoader::addDataOrBuffer):
(WebCore::ResourceLoader::willSendRequestInternal):
(WebCore::ResourceLoader::didReceiveResponse):
(WebCore::ResourceLoader::didReceiveDataOrBuffer):
(WebCore::ResourceLoader::didFinishLoadingOnePart):
(WebCore::ResourceLoader::cleanupForError):
(WebCore::ResourceLoader::shouldUseCredentialStorage):
(WebCore::ResourceLoader::didReceiveAuthenticationChallenge):
* loader/ResourceLoader.h:
(WebCore::ResourceLoader::shouldSendResourceLoadCallbacks):
(WebCore::ResourceLoader::setSendCallbackPolicy):
(WebCore::ResourceLoader::shouldSniffContent):
(WebCore::ResourceLoader::shouldIncludeCertificateInfo):
* loader/ResourceLoaderOptions.h:
(WebCore::ResourceLoaderOptions::ResourceLoaderOptions):
(WebCore::ResourceLoaderOptions::sendLoadCallbacks): Deleted.
(WebCore::ResourceLoaderOptions::setSendLoadCallbacks): Deleted.
(WebCore::ResourceLoaderOptions::sniffContent): Deleted.
(WebCore::ResourceLoaderOptions::setSniffContent): Deleted.
(WebCore::ResourceLoaderOptions::dataBufferingPolicy): Deleted.
(WebCore::ResourceLoaderOptions::setDataBufferingPolicy): Deleted.
(WebCore::ResourceLoaderOptions::allowCredentials): Deleted.
(WebCore::ResourceLoaderOptions::setAllowCredentials): Deleted.
(WebCore::ResourceLoaderOptions::securityCheck): Deleted.
(WebCore::ResourceLoaderOptions::setSecurityCheck): Deleted.
(WebCore::ResourceLoaderOptions::certificateInfoPolicy): Deleted.
(WebCore::ResourceLoaderOptions::setCertificateInfoPolicy): Deleted.
(WebCore::ResourceLoaderOptions::contentSecurityPolicyImposition): Deleted.
(WebCore::ResourceLoaderOptions::setContentSecurityPolicyImposition): Deleted.
(WebCore::ResourceLoaderOptions::defersLoadingPolicy): Deleted.
(WebCore::ResourceLoaderOptions::setDefersLoadingPolicy): Deleted.
(WebCore::ResourceLoaderOptions::cachingPolicy): Deleted.
(WebCore::ResourceLoaderOptions::setCachingPolicy): Deleted.
* loader/SubresourceLoader.cpp:
(WebCore::SubresourceLoader::checkRedirectionCrossOriginAccessControl):
* loader/TextTrackLoader.cpp:
(WebCore::TextTrackLoader::load):
* loader/cache/CachedRawResource.cpp:
(WebCore::CachedRawResource::setDataBufferingPolicy):
* loader/cache/CachedResource.cpp:
(WebCore::CachedResource::load):
* loader/cache/CachedResource.h:
(WebCore::CachedResource::shouldSendResourceLoadCallbacks):
(WebCore::CachedResource::dataBufferingPolicy):
(WebCore::CachedResource::allowsCaching):
* loader/cache/CachedResourceLoader.cpp:
(WebCore::CachedResourceLoader::canRequest):
* loader/cache/CachedResourceRequest.cpp:
(WebCore::CachedResourceRequest::setAsPotentiallyCrossOrigin):
* loader/cache/CachedResourceRequest.h:
(WebCore::CachedResourceRequest::allowsCaching):
* loader/cache/CachedResourceRequestInitiators.cpp:
(WebCore::CachedResourceRequestInitiators::CachedResourceRequestInitiators):
* loader/cache/CachedResourceRequestInitiators.h:
* loader/mac/ResourceLoaderMac.mm:
(WebCore::ResourceLoader::willCacheResponse):
(WebCore::ResourceLoader::didReceiveDataArray):
* page/EventSource.cpp:
(WebCore::EventSource::connect):
* style/StylePendingResources.cpp:
(WebCore::Style::loadPendingImage):
(WebCore::Style::loadPendingSVGFilters):
* svg/SVGFEImageElement.cpp:
(WebCore::SVGFEImageElement::requestImageResource):
* svg/SVGFontFaceUriElement.cpp:
(WebCore::SVGFontFaceUriElement::loadFont):
* svg/SVGUseElement.cpp:
(WebCore::SVGUseElement::updateExternalDocument):
* workers/WorkerScriptLoader.cpp:
(WebCore::WorkerScriptLoader::loadSynchronously):
(WebCore::WorkerScriptLoader::loadAsynchronously):
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::createRequest):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchLoadercpp">trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSFontFaceSrcValuecpp">trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageSetValuecpp">trunk/Source/WebCore/css/CSSImageSetValue.cpp</a></li>
<li><a href="#trunkSourceWebCorecssCSSImageValuecpp">trunk/Source/WebCore/css/CSSImageValue.cpp</a></li>
<li><a href="#trunkSourceWebCoredomScriptElementcpp">trunk/Source/WebCore/dom/ScriptElement.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderLoadercpp">trunk/Source/WebCore/fileapi/FileReaderLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLLinkElementcpp">trunk/Source/WebCore/html/HTMLLinkElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorNetworkAgentcpp">trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp">trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderImageLoadercpp">trunk/Source/WebCore/loader/ImageLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoadercpp">trunk/Source/WebCore/loader/ResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderh">trunk/Source/WebCore/loader/ResourceLoader.h</a></li>
<li><a href="#trunkSourceWebCoreloaderResourceLoaderOptionsh">trunk/Source/WebCore/loader/ResourceLoaderOptions.h</a></li>
<li><a href="#trunkSourceWebCoreloaderSubresourceLoadercpp">trunk/Source/WebCore/loader/SubresourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderTextTrackLoadercpp">trunk/Source/WebCore/loader/TextTrackLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedRawResourcecpp">trunk/Source/WebCore/loader/cache/CachedRawResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourcecpp">trunk/Source/WebCore/loader/cache/CachedResource.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceh">trunk/Source/WebCore/loader/cache/CachedResource.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceLoadercpp">trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequestcpp">trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequesth">trunk/Source/WebCore/loader/cache/CachedResourceRequest.h</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequestInitiatorscpp">trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadercacheCachedResourceRequestInitiatorsh">trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h</a></li>
<li><a href="#trunkSourceWebCoreloadercfResourceLoaderCFNetcpp">trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp</a></li>
<li><a href="#trunkSourceWebCoreloadermacResourceLoaderMacmm">trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm</a></li>
<li><a href="#trunkSourceWebCorepageEventSourcecpp">trunk/Source/WebCore/page/EventSource.cpp</a></li>
<li><a href="#trunkSourceWebCorestyleStylePendingResourcescpp">trunk/Source/WebCore/style/StylePendingResources.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFEImageElementcpp">trunk/Source/WebCore/svg/SVGFEImageElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGFontFaceUriElementcpp">trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp</a></li>
<li><a href="#trunkSourceWebCoresvgSVGUseElementcpp">trunk/Source/WebCore/svg/SVGUseElement.cpp</a></li>
<li><a href="#trunkSourceWebCoreworkersWorkerScriptLoadercpp">trunk/Source/WebCore/workers/WorkerScriptLoader.cpp</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/ChangeLog 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -1,3 +1,128 @@
</span><ins>+2016-08-01 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Pass directly FetchRequest fetch options to ThreadableLoader
+ https://bugs.webkit.org/show_bug.cgi?id=160407
+
+ Reviewed by Sam Weinig.
+
+ No change of behavior.
+
+ Added a ResourceLoaderOptions constructor that takes a FetchOptions as input.
+ Removed setters and getters of ResourceLoaderOptions as it is a struct.
+ Updated member fields accordingly.
+
+ Updated code accordingly.
+ Removed explicit option setting if it is the same as the default value.
+
+ * Modules/fetch/FetchLoader.cpp:
+ (WebCore::FetchLoader::start):
+ * css/CSSFontFaceSrcValue.cpp:
+ (WebCore::CSSFontFaceSrcValue::cachedFont):
+ * css/CSSImageSetValue.cpp:
+ (WebCore::CSSImageSetValue::cachedImageSet):
+ * css/CSSImageValue.cpp:
+ (WebCore::CSSImageValue::cachedImage):
+ * dom/ScriptElement.cpp:
+ (WebCore::ScriptElement::requestScript):
+ * fileapi/FileReaderLoader.cpp:
+ (WebCore::FileReaderLoader::start):
+ * html/HTMLLinkElement.cpp:
+ (WebCore::HTMLLinkElement::process):
+ * inspector/InspectorNetworkAgent.cpp:
+ (WebCore::InspectorNetworkAgent::loadResource):
+ * loader/CrossOriginPreflightChecker.cpp:
+ (WebCore::CrossOriginPreflightChecker::validatePreflightResponse):
+ (WebCore::CrossOriginPreflightChecker::startPreflight):
+ * loader/DocumentThreadableLoader.cpp:
+ (WebCore::DocumentThreadableLoader::DocumentThreadableLoader):
+ (WebCore::DocumentThreadableLoader::makeCrossOriginAccessRequest):
+ (WebCore::DocumentThreadableLoader::makeSimpleCrossOriginAccessRequest):
+ (WebCore::DocumentThreadableLoader::redirectReceived):
+ (WebCore::DocumentThreadableLoader::didReceiveResponse):
+ (WebCore::DocumentThreadableLoader::preflightSuccess):
+ (WebCore::DocumentThreadableLoader::loadRequest):
+ * loader/ImageLoader.cpp:
+ (WebCore::ImageLoader::updateFromElement):
+ * loader/ResourceLoader.cpp:
+ (WebCore::ResourceLoader::ResourceLoader):
+ (WebCore::ResourceLoader::init):
+ (WebCore::ResourceLoader::start):
+ (WebCore::ResourceLoader::setDefersLoading):
+ (WebCore::ResourceLoader::setDataBufferingPolicy):
+ (WebCore::ResourceLoader::addDataOrBuffer):
+ (WebCore::ResourceLoader::willSendRequestInternal):
+ (WebCore::ResourceLoader::didReceiveResponse):
+ (WebCore::ResourceLoader::didReceiveDataOrBuffer):
+ (WebCore::ResourceLoader::didFinishLoadingOnePart):
+ (WebCore::ResourceLoader::cleanupForError):
+ (WebCore::ResourceLoader::shouldUseCredentialStorage):
+ (WebCore::ResourceLoader::didReceiveAuthenticationChallenge):
+ * loader/ResourceLoader.h:
+ (WebCore::ResourceLoader::shouldSendResourceLoadCallbacks):
+ (WebCore::ResourceLoader::setSendCallbackPolicy):
+ (WebCore::ResourceLoader::shouldSniffContent):
+ (WebCore::ResourceLoader::shouldIncludeCertificateInfo):
+ * loader/ResourceLoaderOptions.h:
+ (WebCore::ResourceLoaderOptions::ResourceLoaderOptions):
+ (WebCore::ResourceLoaderOptions::sendLoadCallbacks): Deleted.
+ (WebCore::ResourceLoaderOptions::setSendLoadCallbacks): Deleted.
+ (WebCore::ResourceLoaderOptions::sniffContent): Deleted.
+ (WebCore::ResourceLoaderOptions::setSniffContent): Deleted.
+ (WebCore::ResourceLoaderOptions::dataBufferingPolicy): Deleted.
+ (WebCore::ResourceLoaderOptions::setDataBufferingPolicy): Deleted.
+ (WebCore::ResourceLoaderOptions::allowCredentials): Deleted.
+ (WebCore::ResourceLoaderOptions::setAllowCredentials): Deleted.
+ (WebCore::ResourceLoaderOptions::securityCheck): Deleted.
+ (WebCore::ResourceLoaderOptions::setSecurityCheck): Deleted.
+ (WebCore::ResourceLoaderOptions::certificateInfoPolicy): Deleted.
+ (WebCore::ResourceLoaderOptions::setCertificateInfoPolicy): Deleted.
+ (WebCore::ResourceLoaderOptions::contentSecurityPolicyImposition): Deleted.
+ (WebCore::ResourceLoaderOptions::setContentSecurityPolicyImposition): Deleted.
+ (WebCore::ResourceLoaderOptions::defersLoadingPolicy): Deleted.
+ (WebCore::ResourceLoaderOptions::setDefersLoadingPolicy): Deleted.
+ (WebCore::ResourceLoaderOptions::cachingPolicy): Deleted.
+ (WebCore::ResourceLoaderOptions::setCachingPolicy): Deleted.
+ * loader/SubresourceLoader.cpp:
+ (WebCore::SubresourceLoader::checkRedirectionCrossOriginAccessControl):
+ * loader/TextTrackLoader.cpp:
+ (WebCore::TextTrackLoader::load):
+ * loader/cache/CachedRawResource.cpp:
+ (WebCore::CachedRawResource::setDataBufferingPolicy):
+ * loader/cache/CachedResource.cpp:
+ (WebCore::CachedResource::load):
+ * loader/cache/CachedResource.h:
+ (WebCore::CachedResource::shouldSendResourceLoadCallbacks):
+ (WebCore::CachedResource::dataBufferingPolicy):
+ (WebCore::CachedResource::allowsCaching):
+ * loader/cache/CachedResourceLoader.cpp:
+ (WebCore::CachedResourceLoader::canRequest):
+ * loader/cache/CachedResourceRequest.cpp:
+ (WebCore::CachedResourceRequest::setAsPotentiallyCrossOrigin):
+ * loader/cache/CachedResourceRequest.h:
+ (WebCore::CachedResourceRequest::allowsCaching):
+ * loader/cache/CachedResourceRequestInitiators.cpp:
+ (WebCore::CachedResourceRequestInitiators::CachedResourceRequestInitiators):
+ * loader/cache/CachedResourceRequestInitiators.h:
+ * loader/mac/ResourceLoaderMac.mm:
+ (WebCore::ResourceLoader::willCacheResponse):
+ (WebCore::ResourceLoader::didReceiveDataArray):
+ * page/EventSource.cpp:
+ (WebCore::EventSource::connect):
+ * style/StylePendingResources.cpp:
+ (WebCore::Style::loadPendingImage):
+ (WebCore::Style::loadPendingSVGFilters):
+ * svg/SVGFEImageElement.cpp:
+ (WebCore::SVGFEImageElement::requestImageResource):
+ * svg/SVGFontFaceUriElement.cpp:
+ (WebCore::SVGFontFaceUriElement::loadFont):
+ * svg/SVGUseElement.cpp:
+ (WebCore::SVGUseElement::updateExternalDocument):
+ * workers/WorkerScriptLoader.cpp:
+ (WebCore::WorkerScriptLoader::loadSynchronously):
+ (WebCore::WorkerScriptLoader::loadAsynchronously):
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::createRequest):
+
</ins><span class="cx"> 2016-08-01 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Move the redirected XComposite window to the web process
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #if ENABLE(FETCH_API)
</span><span class="cx">
</span><span class="cx"> #include "BlobURL.h"
</span><ins>+#include "CachedResourceRequestInitiators.h"
</ins><span class="cx"> #include "FetchBody.h"
</span><span class="cx"> #include "FetchLoaderClient.h"
</span><span class="cx"> #include "FetchRequest.h"
</span><span class="lines">@@ -59,11 +60,10 @@
</span><span class="cx"> request.setHTTPMethod("GET");
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.setSendLoadCallbacks(SendCallbacks);
- options.setSniffContent(DoNotSniffContent);
- options.setDataBufferingPolicy(DoNotBufferData);
</del><ins>+ options.sendLoadCallbacks = SendCallbacks;
+ options.dataBufferingPolicy = DoNotBufferData;
</ins><span class="cx"> options.preflightPolicy = ConsiderPreflight;
</span><del>- options.setAllowCredentials(AllowStoredCredentials);
</del><ins>+ options.credentials = FetchOptions::Credentials::Include;
</ins><span class="cx"> options.mode = FetchOptions::Mode::SameOrigin;
</span><span class="cx"> options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
</span><span class="cx">
</span><span class="lines">@@ -73,18 +73,10 @@
</span><span class="cx">
</span><span class="cx"> void FetchLoader::start(ScriptExecutionContext& context, const FetchRequest& request)
</span><span class="cx"> {
</span><del>- ThreadableLoaderOptions options;
- options.setSendLoadCallbacks(SendCallbacks);
- options.setSniffContent(DoNotSniffContent);
- options.setDataBufferingPolicy(DoNotBufferData);
- options.preflightPolicy = ConsiderPreflight;
- options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
</del><ins>+ ThreadableLoaderOptions options(request.fetchOptions(), ConsiderPreflight, ContentSecurityPolicyEnforcement::DoNotEnforce, String(cachedResourceRequestInitiators().fetch));
+ options.sendLoadCallbacks = SendCallbacks;
+ options.dataBufferingPolicy = DoNotBufferData;
</ins><span class="cx">
</span><del>- // FIXME: Pass directly all fetch options to loader options.
- options.redirect = request.fetchOptions().redirect;
- options.mode = request.fetchOptions().mode;
- options.credentials = request.fetchOptions().credentials;
-
</del><span class="cx"> m_loader = ThreadableLoader::create(&context, this, request.internalRequest(), options);
</span><span class="cx"> m_isStarted = m_loader;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSFontFaceSrcValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/css/CSSFontFaceSrcValue.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx"> return m_cachedFont.get();
</span><span class="cx">
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(isInitiatingElementInUserAgentShadowTree ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = isInitiatingElementInUserAgentShadowTree ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document->completeURL(m_resource)), options);
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><span class="cx"> if (options.mode == FetchOptions::Mode::Cors) {
</span><span class="cx"> ASSERT(document->securityOrigin());
</span><del>- updateRequestForAccessControl(request.mutableResourceRequest(), *document->securityOrigin(), options.allowCredentials());
</del><ins>+ updateRequestForAccessControl(request.mutableResourceRequest(), *document->securityOrigin(), options.allowCredentials);
</ins><span class="cx"> }
</span><span class="cx"> if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
</span><span class="cx"> detachPendingImage();
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/css/CSSImageValue.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> if (options.mode == FetchOptions::Mode::Cors) {
</span><span class="cx"> ASSERT(loader.document()->securityOrigin());
</span><del>- updateRequestForAccessControl(request.mutableResourceRequest(), *loader.document()->securityOrigin(), options.allowCredentials());
</del><ins>+ updateRequestForAccessControl(request.mutableResourceRequest(), *loader.document()->securityOrigin(), options.allowCredentials);
</ins><span class="cx"> }
</span><span class="cx"> if (CachedResourceHandle<CachedImage> cachedImage = loader.requestImage(request)) {
</span><span class="cx"> detachPendingImage();
</span></span></pre></div>
<a id="trunkSourceWebCoredomScriptElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/ScriptElement.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/ScriptElement.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/dom/ScriptElement.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -261,7 +261,7 @@
</span><span class="cx"> if (!stripLeadingAndTrailingHTMLSpaces(sourceUrl).isEmpty()) {
</span><span class="cx"> bool hasKnownNonce = m_element.document().contentSecurityPolicy()->allowScriptWithNonce(m_element.attributeWithoutSynchronization(HTMLNames::nonceAttr), m_element.isInUserAgentShadowTree());
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(hasKnownNonce ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = hasKnownNonce ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(m_element.document().completeURL(sourceUrl)), options);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -86,10 +86,8 @@
</span><span class="cx"> request.setHTTPMethod("GET");
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.setSendLoadCallbacks(SendCallbacks);
- options.setSniffContent(DoNotSniffContent);
- options.setDataBufferingPolicy(DoNotBufferData);
- options.preflightPolicy = ConsiderPreflight;
</del><ins>+ options.sendLoadCallbacks = SendCallbacks;
+ options.dataBufferingPolicy = DoNotBufferData;
</ins><span class="cx"> options.credentials = FetchOptions::Credentials::Include;
</span><span class="cx"> options.mode = FetchOptions::Mode::SameOrigin;
</span><span class="cx"> options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLLinkElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLLinkElement.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/html/HTMLLinkElement.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -259,7 +259,7 @@
</span><span class="cx">
</span><span class="cx"> if (document().contentSecurityPolicy()->allowStyleWithNonce(attributeWithoutSynchronization(HTMLNames::nonceAttr))) {
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(ContentSecurityPolicyImposition::SkipPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = ContentSecurityPolicyImposition::SkipPolicyCheck;
</ins><span class="cx"> request.setOptions(options);
</span><span class="cx"> }
</span><span class="cx"> request.setAsPotentiallyCrossOrigin(crossOrigin(), document());
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorNetworkAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/inspector/InspectorNetworkAgent.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -670,8 +670,8 @@
</span><span class="cx"> request.setHiddenFromInspector(true);
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.setSendLoadCallbacks(SendCallbacks); // So we remove this from m_hiddenRequestIdentifiers on completion.
- options.setDefersLoadingPolicy(DefersLoadingPolicy::DisallowDefersLoading); // So the request is never deferred.
</del><ins>+ options.sendLoadCallbacks = SendCallbacks; // So we remove this from m_hiddenRequestIdentifiers on completion.
+ options.defersLoadingPolicy = DefersLoadingPolicy::DisallowDefersLoading; // So the request is never deferred.
</ins><span class="cx"> options.mode = FetchOptions::Mode::NoCors;
</span><span class="cx"> options.credentials = FetchOptions::Credentials::SameOrigin;
</span><span class="cx"> options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -69,12 +69,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String description;
</span><del>- if (!passesAccessControlCheck(response, loader.options().allowCredentials(), loader.securityOrigin(), description)) {
</del><ins>+ if (!passesAccessControlCheck(response, loader.options().allowCredentials, loader.securityOrigin(), description)) {
</ins><span class="cx"> loader.preflightFailure(identifier, ResourceError(errorDomainWebKitInternal, 0, request.url(), description, ResourceError::Type::AccessControl));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- auto result = std::make_unique<CrossOriginPreflightResultCacheItem>(loader.options().allowCredentials());
</del><ins>+ auto result = std::make_unique<CrossOriginPreflightResultCacheItem>(loader.options().allowCredentials);
</ins><span class="cx"> if (!result->parse(response, description)
</span><span class="cx"> || !result->allowsCrossOriginMethod(request.httpMethod(), description)
</span><span class="cx"> || !result->allowsCrossOriginHeaders(request.httpHeaderFields(), description)) {
</span><span class="lines">@@ -100,15 +100,8 @@
</span><span class="cx">
</span><span class="cx"> void CrossOriginPreflightChecker::startPreflight()
</span><span class="cx"> {
</span><del>- auto options = m_loader.options();
</del><ins>+ ResourceLoaderOptions options = static_cast<FetchOptions>(m_loader.options());
</ins><span class="cx"> options.credentials = FetchOptions::Credentials::Omit;
</span><del>- options.setSecurityCheck(DoSecurityCheck);
- // Don't sniff content or send load callbacks for the preflight request.
- options.setSendLoadCallbacks(DoNotSendCallbacks);
- options.setSniffContent(DoNotSniffContent);
- // Keep buffering the data for the preflight request.
- options.setDataBufferingPolicy(BufferData);
-
</del><span class="cx"> options.redirect = FetchOptions::Redirect::Manual;
</span><span class="cx">
</span><span class="cx"> CachedResourceRequest preflightRequest(createAccessControlPreflightRequest(m_request, m_loader.securityOrigin()), options);
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx">
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(isAllowedByContentSecurityPolicy(request.url()));
</span><span class="cx">
</span><del>- m_options.setAllowCredentials((m_options.credentials == FetchOptions::Credentials::Include || (m_options.credentials == FetchOptions::Credentials::SameOrigin && m_sameOriginRequest)) ? AllowStoredCredentials : DoNotAllowStoredCredentials);
</del><ins>+ m_options.allowCredentials = (m_options.credentials == FetchOptions::Credentials::Include || (m_options.credentials == FetchOptions::Credentials::SameOrigin && m_sameOriginRequest)) ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</ins><span class="cx">
</span><span class="cx"> if (m_sameOriginRequest || m_options.mode == FetchOptions::Mode::NoCors) {
</span><span class="cx"> loadRequest(WTFMove(request), DoSecurityCheck);
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> makeSimpleCrossOriginAccessRequest(WTFMove(request));
</span><span class="cx"> else {
</span><span class="cx"> m_simpleRequest = false;
</span><del>- if (CrossOriginPreflightResultCache::singleton().canSkipPreflight(securityOrigin().toString(), request.url(), m_options.allowCredentials(), request.httpMethod(), request.httpHeaderFields()))
</del><ins>+ if (CrossOriginPreflightResultCache::singleton().canSkipPreflight(securityOrigin().toString(), request.url(), m_options.allowCredentials, request.httpMethod(), request.httpHeaderFields()))
</ins><span class="cx"> preflightSuccess(WTFMove(request));
</span><span class="cx"> else
</span><span class="cx"> makeCrossOriginAccessRequestWithPreflight(WTFMove(request));
</span><span class="lines">@@ -137,7 +137,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- updateRequestForAccessControl(request, securityOrigin(), m_options.allowCredentials());
</del><ins>+ updateRequestForAccessControl(request, securityOrigin(), m_options.allowCredentials);
</ins><span class="cx"> loadRequest(WTFMove(request), DoSecurityCheck);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> if (m_simpleRequest) {
</span><span class="cx"> String accessControlErrorDescription;
</span><span class="cx"> allowRedirect = isValidCrossOriginRedirectionURL(request.url())
</span><del>- && (m_sameOriginRequest || passesAccessControlCheck(redirectResponse, m_options.allowCredentials(), securityOrigin(), accessControlErrorDescription));
</del><ins>+ && (m_sameOriginRequest || passesAccessControlCheck(redirectResponse, m_options.allowCredentials, securityOrigin(), accessControlErrorDescription));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (allowRedirect) {
</span><span class="lines">@@ -245,7 +245,7 @@
</span><span class="cx"> m_sameOriginRequest = false;
</span><span class="cx">
</span><span class="cx"> if (m_options.credentials == FetchOptions::Credentials::SameOrigin)
</span><del>- m_options.setAllowCredentials(DoNotAllowStoredCredentials);
</del><ins>+ m_options.allowCredentials = DoNotAllowStoredCredentials;
</ins><span class="cx">
</span><span class="cx"> cleanRedirectedRequestForAccessControl(request);
</span><span class="cx">
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> String accessControlErrorDescription;
</span><span class="cx"> if (!m_sameOriginRequest && m_options.mode == FetchOptions::Mode::Cors) {
</span><del>- if (!passesAccessControlCheck(response, m_options.allowCredentials(), securityOrigin(), accessControlErrorDescription)) {
</del><ins>+ if (!passesAccessControlCheck(response, m_options.allowCredentials, securityOrigin(), accessControlErrorDescription)) {
</ins><span class="cx"> m_client->didFail(ResourceError(errorDomainWebKitInternal, 0, response.url(), accessControlErrorDescription, ResourceError::Type::AccessControl));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -334,7 +334,7 @@
</span><span class="cx"> void DocumentThreadableLoader::preflightSuccess(ResourceRequest&& request)
</span><span class="cx"> {
</span><span class="cx"> ResourceRequest actualRequest(WTFMove(request));
</span><del>- updateRequestForAccessControl(actualRequest, securityOrigin(), m_options.allowCredentials());
</del><ins>+ updateRequestForAccessControl(actualRequest, securityOrigin(), m_options.allowCredentials);
</ins><span class="cx">
</span><span class="cx"> m_preflightChecker = Nullopt;
</span><span class="cx">
</span><span class="lines">@@ -357,7 +357,7 @@
</span><span class="cx"> {
</span><span class="cx"> // Any credential should have been removed from the cross-site requests.
</span><span class="cx"> const URL& requestURL = request.url();
</span><del>- m_options.setSecurityCheck(securityCheck);
</del><ins>+ m_options.securityCheck = securityCheck;
</ins><span class="cx"> ASSERT(m_sameOriginRequest || requestURL.user().isEmpty());
</span><span class="cx"> ASSERT(m_sameOriginRequest || requestURL.pass().isEmpty());
</span><span class="cx">
</span><span class="lines">@@ -371,7 +371,7 @@
</span><span class="cx"> CachedResourceRequest newRequest(WTFMove(request), options);
</span><span class="cx"> if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())
</span><span class="cx"> newRequest.setInitiator(m_options.initiator);
</span><del>- newRequest.mutableResourceRequest().setAllowCookies(m_options.allowCredentials() == AllowStoredCredentials);
</del><ins>+ newRequest.mutableResourceRequest().setAllowCookies(m_options.allowCredentials == AllowStoredCredentials);
</ins><span class="cx">
</span><span class="cx"> ASSERT(!m_resource);
</span><span class="cx"> m_resource = m_document.cachedResourceLoader().requestRawResource(newRequest);
</span><span class="lines">@@ -393,7 +393,7 @@
</span><span class="cx"> auto& frameLoader = m_document.frame()->loader();
</span><span class="cx"> if (!frameLoader.mixedContentChecker().canRunInsecureContent(m_document.securityOrigin(), requestURL))
</span><span class="cx"> return;
</span><del>- identifier = frameLoader.loadResourceSynchronously(request, m_options.allowCredentials(), m_options.clientCredentialPolicy, error, response, data);
</del><ins>+ identifier = frameLoader.loadResourceSynchronously(request, m_options.allowCredentials, m_options.clientCredentialPolicy, error, response, data);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!error.isNull() && response.httpStatusCode() <= 0) {
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderImageLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ImageLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ImageLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/ImageLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> CachedResourceHandle<CachedImage> newImage = nullptr;
</span><span class="cx"> if (!attr.isNull() && !stripLeadingAndTrailingHTMLSpaces(attr).isEmpty()) {
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(element().isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = element().isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document.completeURL(sourceURI(attr))), options);
</span><span class="cx"> request.setInitiator(&element());
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx"> ResourceLoader::ResourceLoader(Frame& frame, ResourceLoaderOptions options)
</span><span class="cx"> : m_frame(&frame)
</span><span class="cx"> , m_documentLoader(frame.loader().activeDocumentLoader())
</span><del>- , m_defersLoading(options.defersLoadingPolicy() == DefersLoadingPolicy::AllowDefersLoading && frame.page()->defersLoading())
</del><ins>+ , m_defersLoading(options.defersLoadingPolicy == DefersLoadingPolicy::AllowDefersLoading && frame.page()->defersLoading())
</ins><span class="cx"> , m_options(options)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="lines">@@ -125,9 +125,9 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_defersLoading = m_options.defersLoadingPolicy() == DefersLoadingPolicy::AllowDefersLoading && m_frame->page()->defersLoading();
</del><ins>+ m_defersLoading = m_options.defersLoadingPolicy == DefersLoadingPolicy::AllowDefersLoading && m_frame->page()->defersLoading();
</ins><span class="cx">
</span><del>- if (m_options.securityCheck() == DoSecurityCheck && !m_frame->document()->securityOrigin()->canDisplay(clientRequest.url())) {
</del><ins>+ if (m_options.securityCheck == DoSecurityCheck && !m_frame->document()->securityOrigin()->canDisplay(clientRequest.url())) {
</ins><span class="cx"> FrameLoader::reportLocalLoadFailed(m_frame.get(), clientRequest.url().string());
</span><span class="cx"> releaseResources();
</span><span class="cx"> return false;
</span><span class="lines">@@ -206,12 +206,12 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_handle = ResourceHandle::create(frameLoader()->networkingContext(), m_request, this, m_defersLoading, m_options.sniffContent() == SniffContent);
</del><ins>+ m_handle = ResourceHandle::create(frameLoader()->networkingContext(), m_request, this, m_defersLoading, m_options.sniffContent == SniffContent);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::setDefersLoading(bool defers)
</span><span class="cx"> {
</span><del>- if (m_options.defersLoadingPolicy() == DefersLoadingPolicy::DisallowDefersLoading)
</del><ins>+ if (m_options.defersLoadingPolicy == DefersLoadingPolicy::DisallowDefersLoading)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_defersLoading = defers;
</span><span class="lines">@@ -268,14 +268,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::setDataBufferingPolicy(DataBufferingPolicy dataBufferingPolicy)
</span><del>-{
- m_options.setDataBufferingPolicy(dataBufferingPolicy);
</del><ins>+{
+ m_options.dataBufferingPolicy = dataBufferingPolicy;
</ins><span class="cx">
</span><span class="cx"> // Reset any already buffered data
</span><span class="cx"> if (dataBufferingPolicy == DoNotBufferData)
</span><span class="cx"> m_resourceData = nullptr;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> void ResourceLoader::willSwitchToSubstituteResource()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(!m_documentLoader->isSubstituteLoadPending(this));
</span><span class="lines">@@ -286,7 +286,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::addDataOrBuffer(const char* data, unsigned length, SharedBuffer* buffer, DataPayloadType dataPayloadType)
</span><span class="cx"> {
</span><del>- if (m_options.dataBufferingPolicy() == DoNotBufferData)
</del><ins>+ if (m_options.dataBufferingPolicy == DoNotBufferData)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (!m_resourceData || dataPayloadType == DataPayloadWholeResource) {
</span><span class="lines">@@ -350,7 +350,7 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_options.sendLoadCallbacks() == SendCallbacks) {
</del><ins>+ if (m_options.sendLoadCallbacks == SendCallbacks) {
</ins><span class="cx"> if (createdResourceIdentifier)
</span><span class="cx"> frameLoader()->notifier().assignIdentifierToInitialRequest(m_identifier, documentLoader(), request);
</span><span class="cx">
</span><span class="lines">@@ -458,8 +458,8 @@
</span><span class="cx">
</span><span class="cx"> if (FormData* data = m_request.httpBody())
</span><span class="cx"> data->removeGeneratedFilesIfNeeded();
</span><del>-
- if (m_options.sendLoadCallbacks() == SendCallbacks)
</del><ins>+
+ if (m_options.sendLoadCallbacks == SendCallbacks)
</ins><span class="cx"> frameLoader()->notifier().didReceiveResponse(this, m_response);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -489,11 +489,11 @@
</span><span class="cx"> Ref<ResourceLoader> protectedThis(*this);
</span><span class="cx">
</span><span class="cx"> addDataOrBuffer(data, length, buffer.get(), dataPayloadType);
</span><del>-
</del><ins>+
</ins><span class="cx"> // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
</span><span class="cx"> // However, with today's computers and networking speeds, this won't happen in practice.
</span><span class="cx"> // Could be an issue with a giant local file.
</span><del>- if (m_options.sendLoadCallbacks() == SendCallbacks && m_frame)
</del><ins>+ if (m_options.sendLoadCallbacks == SendCallbacks && m_frame)
</ins><span class="cx"> frameLoader()->notifier().didReceiveData(this, buffer ? buffer->data() : data, buffer ? buffer->size() : length, static_cast<int>(encodedDataLength));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -519,7 +519,7 @@
</span><span class="cx"> if (m_notifiedLoadComplete)
</span><span class="cx"> return;
</span><span class="cx"> m_notifiedLoadComplete = true;
</span><del>- if (m_options.sendLoadCallbacks() == SendCallbacks)
</del><ins>+ if (m_options.sendLoadCallbacks == SendCallbacks)
</ins><span class="cx"> frameLoader()->notifier().didFinishLoad(this, finishTime);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -545,7 +545,7 @@
</span><span class="cx"> if (m_notifiedLoadComplete)
</span><span class="cx"> return;
</span><span class="cx"> m_notifiedLoadComplete = true;
</span><del>- if (m_options.sendLoadCallbacks() == SendCallbacks && m_identifier)
</del><ins>+ if (m_options.sendLoadCallbacks == SendCallbacks && m_identifier)
</ins><span class="cx"> frameLoader()->notifier().didFailToLoad(this, error);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -678,9 +678,9 @@
</span><span class="cx">
</span><span class="cx"> bool ResourceLoader::shouldUseCredentialStorage()
</span><span class="cx"> {
</span><del>- if (m_options.allowCredentials() == DoNotAllowStoredCredentials)
</del><ins>+ if (m_options.allowCredentials == DoNotAllowStoredCredentials)
</ins><span class="cx"> return false;
</span><del>-
</del><ins>+
</ins><span class="cx"> Ref<ResourceLoader> protectedThis(*this);
</span><span class="cx"> return frameLoader()->client().shouldUseCredentialStorage(documentLoader(), identifier());
</span><span class="cx"> }
</span><span class="lines">@@ -700,7 +700,7 @@
</span><span class="cx"> // anything including possibly derefing this; one example of this is Radar 3266216.
</span><span class="cx"> Ref<ResourceLoader> protectedThis(*this);
</span><span class="cx">
</span><del>- if (m_options.allowCredentials() == AllowStoredCredentials) {
</del><ins>+ if (m_options.allowCredentials == AllowStoredCredentials) {
</ins><span class="cx"> if (isAllowedToAskUserForCredentials()) {
</span><span class="cx"> frameLoader()->notifier().didReceiveAuthenticationChallenge(this, challenge);
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -125,11 +125,11 @@
</span><span class="cx">
</span><span class="cx"> const URL& url() const { return m_request.url(); }
</span><span class="cx"> ResourceHandle* handle() const { return m_handle.get(); }
</span><del>- bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks() == SendCallbacks; }
- void setSendCallbackPolicy(SendCallbackPolicy sendLoadCallbacks) { m_options.setSendLoadCallbacks(sendLoadCallbacks); }
- bool shouldSniffContent() const { return m_options.sniffContent() == SniffContent; }
</del><ins>+ bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
+ void setSendCallbackPolicy(SendCallbackPolicy sendLoadCallbacks) { m_options.sendLoadCallbacks = sendLoadCallbacks; }
+ bool shouldSniffContent() const { return m_options.sniffContent == SniffContent; }
</ins><span class="cx"> WEBCORE_EXPORT bool isAllowedToAskUserForCredentials() const;
</span><del>- bool shouldIncludeCertificateInfo() const { return m_options.certificateInfoPolicy() == IncludeCertificateInfo; }
</del><ins>+ bool shouldIncludeCertificateInfo() const { return m_options.certificateInfoPolicy == IncludeCertificateInfo; }
</ins><span class="cx">
</span><span class="cx"> bool reachedTerminalState() const { return m_reachedTerminalState; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderOptionsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoaderOptions.h (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoaderOptions.h 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/ResourceLoaderOptions.h 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -81,26 +81,20 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> struct ResourceLoaderOptions : public FetchOptions {
</span><del>- ResourceLoaderOptions()
- : m_sendLoadCallbacks(DoNotSendCallbacks)
- , m_sniffContent(DoNotSniffContent)
- , m_dataBufferingPolicy(BufferData)
- , m_allowCredentials(DoNotAllowStoredCredentials)
- , m_securityCheck(DoSecurityCheck)
- , m_certificateInfoPolicy(DoNotIncludeCertificateInfo)
- {
- }
</del><ins>+ ResourceLoaderOptions() { }
</ins><span class="cx">
</span><ins>+ ResourceLoaderOptions(const FetchOptions& options) : FetchOptions(options) { }
+
</ins><span class="cx"> ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacks, ContentSniffingPolicy sniffContent, DataBufferingPolicy dataBufferingPolicy, StoredCredentials allowCredentials, ClientCredentialPolicy credentialPolicy, FetchOptions::Credentials credentials, SecurityCheckPolicy securityCheck, FetchOptions::Mode mode, CertificateInfoPolicy certificateInfoPolicy, ContentSecurityPolicyImposition contentSecurityPolicyImposition, DefersLoadingPolicy defersLoadingPolicy, CachingPolicy cachingPolicy)
</span><del>- : m_sendLoadCallbacks(sendLoadCallbacks)
- , m_sniffContent(sniffContent)
- , m_dataBufferingPolicy(dataBufferingPolicy)
- , m_allowCredentials(allowCredentials)
- , m_securityCheck(securityCheck)
- , m_certificateInfoPolicy(certificateInfoPolicy)
- , m_contentSecurityPolicyImposition(contentSecurityPolicyImposition)
- , m_defersLoadingPolicy(defersLoadingPolicy)
- , m_cachingPolicy(cachingPolicy)
</del><ins>+ : sendLoadCallbacks(sendLoadCallbacks)
+ , sniffContent(sniffContent)
+ , dataBufferingPolicy(dataBufferingPolicy)
+ , allowCredentials(allowCredentials)
+ , securityCheck(securityCheck)
+ , certificateInfoPolicy(certificateInfoPolicy)
+ , contentSecurityPolicyImposition(contentSecurityPolicyImposition)
+ , defersLoadingPolicy(defersLoadingPolicy)
+ , cachingPolicy(cachingPolicy)
</ins><span class="cx"> , clientCredentialPolicy(credentialPolicy)
</span><span class="cx"> {
</span><span class="cx"> this->credentials = credentials;
</span><span class="lines">@@ -107,35 +101,16 @@
</span><span class="cx"> this->mode = mode;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- SendCallbackPolicy sendLoadCallbacks() const { return static_cast<SendCallbackPolicy>(m_sendLoadCallbacks); }
- void setSendLoadCallbacks(SendCallbackPolicy allow) { m_sendLoadCallbacks = allow; }
- ContentSniffingPolicy sniffContent() const { return static_cast<ContentSniffingPolicy>(m_sniffContent); }
- void setSniffContent(ContentSniffingPolicy policy) { m_sniffContent = policy; }
- DataBufferingPolicy dataBufferingPolicy() const { return static_cast<DataBufferingPolicy>(m_dataBufferingPolicy); }
- void setDataBufferingPolicy(DataBufferingPolicy policy) { m_dataBufferingPolicy = policy; }
- StoredCredentials allowCredentials() const { return static_cast<StoredCredentials>(m_allowCredentials); }
- void setAllowCredentials(StoredCredentials allow) { m_allowCredentials = allow; }
- SecurityCheckPolicy securityCheck() const { return static_cast<SecurityCheckPolicy>(m_securityCheck); }
- void setSecurityCheck(SecurityCheckPolicy check) { m_securityCheck = check; }
- CertificateInfoPolicy certificateInfoPolicy() const { return static_cast<CertificateInfoPolicy>(m_certificateInfoPolicy); }
- void setCertificateInfoPolicy(CertificateInfoPolicy policy) { m_certificateInfoPolicy = policy; }
- ContentSecurityPolicyImposition contentSecurityPolicyImposition() const { return m_contentSecurityPolicyImposition; }
- void setContentSecurityPolicyImposition(ContentSecurityPolicyImposition imposition) { m_contentSecurityPolicyImposition = imposition; }
- DefersLoadingPolicy defersLoadingPolicy() const { return m_defersLoadingPolicy; }
- void setDefersLoadingPolicy(DefersLoadingPolicy defersLoadingPolicy) { m_defersLoadingPolicy = defersLoadingPolicy; }
- CachingPolicy cachingPolicy() const { return m_cachingPolicy; }
- void setCachingPolicy(CachingPolicy cachingPolicy) { m_cachingPolicy = cachingPolicy; }
</del><ins>+ SendCallbackPolicy sendLoadCallbacks { DoNotSendCallbacks };
+ ContentSniffingPolicy sniffContent { DoNotSniffContent };
+ DataBufferingPolicy dataBufferingPolicy { BufferData };
+ StoredCredentials allowCredentials { DoNotAllowStoredCredentials };
+ SecurityCheckPolicy securityCheck { DoSecurityCheck };
+ CertificateInfoPolicy certificateInfoPolicy { DoNotIncludeCertificateInfo };
+ ContentSecurityPolicyImposition contentSecurityPolicyImposition { ContentSecurityPolicyImposition::DoPolicyCheck };
+ DefersLoadingPolicy defersLoadingPolicy { DefersLoadingPolicy::AllowDefersLoading };
+ CachingPolicy cachingPolicy { CachingPolicy::AllowCaching };
</ins><span class="cx">
</span><del>- unsigned m_sendLoadCallbacks : 1;
- unsigned m_sniffContent : 1;
- unsigned m_dataBufferingPolicy : 1;
- unsigned m_allowCredentials : 1; // Whether HTTP credentials and cookies are sent with the request.
- unsigned m_securityCheck : 1;
- unsigned m_certificateInfoPolicy : 1; // Whether the response should include certificate info.
- ContentSecurityPolicyImposition m_contentSecurityPolicyImposition { ContentSecurityPolicyImposition::DoPolicyCheck };
- DefersLoadingPolicy m_defersLoadingPolicy { DefersLoadingPolicy::AllowDefersLoading };
- CachingPolicy m_cachingPolicy { CachingPolicy::AllowCaching };
-
</del><span class="cx"> ClientCredentialPolicy clientCredentialPolicy { ClientCredentialPolicy::CannotAskClientForCredentials };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -415,7 +415,7 @@
</span><span class="cx"> ASSERT(m_origin);
</span><span class="cx"> String errorDescription;
</span><span class="cx"> bool responsePassesCORS = m_origin->canRequest(previousRequest.url())
</span><del>- || passesAccessControlCheck(redirectResponse, options().allowCredentials(), *m_origin, errorDescription);
</del><ins>+ || passesAccessControlCheck(redirectResponse, options().allowCredentials, *m_origin, errorDescription);
</ins><span class="cx"> if (!responsePassesCORS || !isValidCrossOriginRedirectionURL(newRequest.url())) {
</span><span class="cx"> if (m_frame && m_frame->document()) {
</span><span class="cx"> String errorMessage = "Cross-origin redirection denied by Cross-Origin Resource Sharing policy: " +
</span><span class="lines">@@ -428,7 +428,7 @@
</span><span class="cx"> // If the request URL origin is not the same as the original origin, the request origin should be set to a globally unique identifier.
</span><span class="cx"> m_origin = SecurityOrigin::createUnique();
</span><span class="cx"> cleanRedirectedRequestForAccessControl(newRequest);
</span><del>- updateRequestForAccessControl(newRequest, *m_origin, options().allowCredentials());
</del><ins>+ updateRequestForAccessControl(newRequest, *m_origin, options().allowCredentials);
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderTextTrackLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/TextTrackLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/TextTrackLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/TextTrackLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -153,7 +153,7 @@
</span><span class="cx"> Document* document = downcast<Document>(m_scriptExecutionContext);
</span><span class="cx">
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(isInitiatingElementInUserAgentShadowTree ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = isInitiatingElementInUserAgentShadowTree ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> CachedResourceRequest cueRequest(ResourceRequest(document->completeURL(url)), options);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx">
</span><span class="cx"> void CachedRawResource::setDataBufferingPolicy(DataBufferingPolicy dataBufferingPolicy)
</span><span class="cx"> {
</span><del>- m_options.setDataBufferingPolicy(dataBufferingPolicy);
</del><ins>+ m_options.dataBufferingPolicy = dataBufferingPolicy;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool shouldIgnoreHeaderForCacheReuse(HTTPHeaderName name)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FrameLoader& frameLoader = frame.loader();
</span><del>- if (options.securityCheck() == DoSecurityCheck && (frameLoader.state() == FrameStateProvisional || !frameLoader.activeDocumentLoader() || frameLoader.activeDocumentLoader()->isStopping())) {
</del><ins>+ if (options.securityCheck == DoSecurityCheck && (frameLoader.state() == FrameStateProvisional || !frameLoader.activeDocumentLoader() || frameLoader.activeDocumentLoader()->isStopping())) {
</ins><span class="cx"> failBeforeStarting();
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -226,10 +226,10 @@
</span><span class="cx"> bool errorOccurred() const { return m_status == LoadError || m_status == DecodeError; }
</span><span class="cx"> bool loadFailedOrCanceled() const { return !m_error.isNull(); }
</span><span class="cx">
</span><del>- bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks() == SendCallbacks; }
- DataBufferingPolicy dataBufferingPolicy() const { return m_options.dataBufferingPolicy(); }
</del><ins>+ bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks == SendCallbacks; }
+ DataBufferingPolicy dataBufferingPolicy() const { return m_options.dataBufferingPolicy; }
</ins><span class="cx">
</span><del>- bool allowsCaching() const { return m_options.cachingPolicy() == CachingPolicy::AllowCaching; }
</del><ins>+ bool allowsCaching() const { return m_options.cachingPolicy == CachingPolicy::AllowCaching; }
</ins><span class="cx">
</span><span class="cx"> virtual void destroyDecodedData() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool skipContentSecurityPolicyCheck = options.contentSecurityPolicyImposition() == ContentSecurityPolicyImposition::SkipPolicyCheck;
</del><ins>+ bool skipContentSecurityPolicyCheck = options.contentSecurityPolicyImposition == ContentSecurityPolicyImposition::SkipPolicyCheck;
</ins><span class="cx"> ContentSecurityPolicy::RedirectResponseReceived redirectResponseReceived = didReceiveRedirectResponse ? ContentSecurityPolicy::RedirectResponseReceived::Yes : ContentSecurityPolicy::RedirectResponseReceived::No;
</span><span class="cx">
</span><span class="cx"> // Some types of resources can be loaded only from the same origin. Other
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -100,10 +100,10 @@
</span><span class="cx"> return;
</span><span class="cx"> m_options.mode = FetchOptions::Mode::Cors;
</span><span class="cx"> m_options.credentials = equalLettersIgnoringASCIICase(mode, "use-credentials") ? FetchOptions::Credentials::Include : FetchOptions::Credentials::SameOrigin;
</span><del>- m_options.setAllowCredentials(equalLettersIgnoringASCIICase(mode, "use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials);
</del><ins>+ m_options.allowCredentials = equalLettersIgnoringASCIICase(mode, "use-credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</ins><span class="cx">
</span><span class="cx"> ASSERT(document.securityOrigin());
</span><del>- updateRequestForAccessControl(m_resourceRequest, *document.securityOrigin(), m_options.allowCredentials());
</del><ins>+ updateRequestForAccessControl(m_resourceRequest, *document.securityOrigin(), m_options.allowCredentials);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequesth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequest.h (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequest.h 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> void setInitiator(PassRefPtr<Element>);
</span><span class="cx"> void setInitiator(const AtomicString& name);
</span><span class="cx"> const AtomicString& initiatorName() const;
</span><del>- bool allowsCaching() const { return m_options.cachingPolicy() == CachingPolicy::AllowCaching; }
</del><ins>+ bool allowsCaching() const { return m_options.cachingPolicy == CachingPolicy::AllowCaching; }
</ins><span class="cx">
</span><span class="cx"> void setInitiator(DocumentLoader&);
</span><span class="cx"> DocumentLoader* initiatingDocumentLoader() const { return m_initiatingDocumentLoader.get(); }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequestInitiatorscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -30,6 +30,7 @@
</span><span class="cx">
</span><span class="cx"> CachedResourceRequestInitiators::CachedResourceRequestInitiators()
</span><span class="cx"> : css("css", AtomicString::ConstructFromLiteral)
</span><ins>+ , fetch("fetch", AtomicString::ConstructFromLiteral)
</ins><span class="cx"> , icon("icon", AtomicString::ConstructFromLiteral)
</span><span class="cx"> , xmlhttprequest("xmlhttprequest", AtomicString::ConstructFromLiteral)
</span><span class="cx"> {
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceRequestInitiatorsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cache/CachedResourceRequestInitiators.h 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> CachedResourceRequestInitiators();
</span><span class="cx">
</span><span class="cx"> const AtomicString css;
</span><ins>+ const AtomicString fetch;
</ins><span class="cx"> const AtomicString icon;
</span><span class="cx"> const AtomicString xmlhttprequest;
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(CachedResourceRequestInitiators); WTF_MAKE_FAST_ALLOCATED;
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercfResourceLoaderCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx">
</span><span class="cx"> bool ResourceLoader::shouldCacheResponse(ResourceHandle*, CFCachedURLResponseRef cachedResponse)
</span><span class="cx"> {
</span><del>- if (m_options.sendLoadCallbacks() == DoNotSendCallbacks)
</del><ins>+ if (m_options.sendLoadCallbacks == DoNotSendCallbacks)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> CFURLResponseRef response = CFCachedURLResponseGetWrappedResponse(cachedResponse);
</span></span></pre></div>
<a id="trunkSourceWebCoreloadermacResourceLoaderMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx">
</span><span class="cx"> NSCachedURLResponse* ResourceLoader::willCacheResponse(ResourceHandle*, NSCachedURLResponse* response)
</span><span class="cx"> {
</span><del>- if (m_options.sendLoadCallbacks() == DoNotSendCallbacks)
</del><ins>+ if (m_options.sendLoadCallbacks == DoNotSendCallbacks)
</ins><span class="cx"> return nullptr;
</span><span class="cx"> return frameLoader()->client().willCacheResponse(documentLoader(), identifier(), response);
</span><span class="cx"> }
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx"> CFDataRef data = static_cast<CFDataRef>(CFArrayGetValueAtIndex(dataArray, i));
</span><span class="cx"> unsigned dataLen = static_cast<unsigned>(CFDataGetLength(data));
</span><span class="cx">
</span><del>- if (m_options.dataBufferingPolicy() == BufferData) {
</del><ins>+ if (m_options.dataBufferingPolicy == BufferData) {
</ins><span class="cx"> if (!m_resourceData)
</span><span class="cx"> m_resourceData = SharedBuffer::create();
</span><span class="cx"> m_resourceData->append(data);
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> // FIXME: If we get a resource with more than 2B bytes, this code won't do the right thing.
</span><span class="cx"> // However, with today's computers and networking speeds, this won't happen in practice.
</span><span class="cx"> // Could be an issue with a giant local file.
</span><del>- if (m_options.sendLoadCallbacks() == SendCallbacks && m_frame)
</del><ins>+ if (m_options.sendLoadCallbacks == SendCallbacks && m_frame)
</ins><span class="cx"> frameLoader()->notifier().didReceiveData(this, reinterpret_cast<const char*>(CFDataGetBytePtr(data)), dataLen, dataLen);
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventSource.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/page/EventSource.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -104,12 +104,11 @@
</span><span class="cx"> request.setHTTPHeaderField(HTTPHeaderName::LastEventID, m_lastEventId);
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.setSendLoadCallbacks(SendCallbacks);
- options.setSniffContent(DoNotSniffContent);
</del><ins>+ options.sendLoadCallbacks = SendCallbacks;
</ins><span class="cx"> options.credentials = m_withCredentials ? FetchOptions::Credentials::Include : FetchOptions::Credentials::SameOrigin;
</span><span class="cx"> options.preflightPolicy = PreventPreflight;
</span><span class="cx"> options.mode = FetchOptions::Mode::Cors;
</span><del>- options.setDataBufferingPolicy(DoNotBufferData);
</del><ins>+ options.dataBufferingPolicy = DoNotBufferData;
</ins><span class="cx"> options.contentSecurityPolicyEnforcement = scriptExecutionContext()->shouldBypassMainWorldContentSecurityPolicy() ? ContentSecurityPolicyEnforcement::DoNotEnforce : ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective;
</span><span class="cx">
</span><span class="cx"> m_loader = ThreadableLoader::create(scriptExecutionContext(), this, WTFMove(request), options);
</span></span></pre></div>
<a id="trunkSourceWebCorestyleStylePendingResourcescpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/style/StylePendingResources.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/style/StylePendingResources.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/style/StylePendingResources.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -48,12 +48,12 @@
</span><span class="cx"> {
</span><span class="cx"> auto& pendingImage = downcast<StylePendingImage>(image);
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(element && element->isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = element && element->isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> // FIXME: Why does shape-outside have different policy than other properties?
</span><span class="cx"> if (loadPolicy == LoadPolicy::ShapeOutside) {
</span><span class="cx"> options.mode = FetchOptions::Mode::Cors;
</span><del>- options.setAllowCredentials(DoNotAllowStoredCredentials);
</del><ins>+ options.allowCredentials = DoNotAllowStoredCredentials;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (auto imageValue = pendingImage.cssImageValue())
</span><span class="lines">@@ -171,7 +171,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(element && element->isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = element && element->isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> for (auto& filterOperation : pendingResources.pendingSVGFilters)
</span><span class="cx"> filterOperation->getOrCreateCachedSVGDocumentReference()->load(document.cachedResourceLoader(), options);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFEImageElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFEImageElement.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/svg/SVGFEImageElement.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -86,7 +86,7 @@
</span><span class="cx"> void SVGFEImageElement::requestImageResource()
</span><span class="cx"> {
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(href())), options);
</span><span class="cx"> request.setInitiator(this);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGFontFaceUriElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/svg/SVGFontFaceUriElement.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -101,7 +101,7 @@
</span><span class="cx"> const AtomicString& href = getAttribute(XLinkNames::hrefAttr);
</span><span class="cx"> if (!href.isNull()) {
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> CachedResourceLoader& cachedResourceLoader = document().cachedResourceLoader();
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document().completeURL(href)), options);
</span></span></pre></div>
<a id="trunkSourceWebCoresvgSVGUseElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/svg/SVGUseElement.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/svg/SVGUseElement.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/svg/SVGUseElement.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -569,7 +569,7 @@
</span><span class="cx"> m_externalDocument = nullptr;
</span><span class="cx"> else {
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.setContentSecurityPolicyImposition(isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck);
</del><ins>+ options.contentSecurityPolicyImposition = isInUserAgentShadowTree() ? ContentSecurityPolicyImposition::SkipPolicyCheck : ContentSecurityPolicyImposition::DoPolicyCheck;
</ins><span class="cx">
</span><span class="cx"> CachedResourceRequest request { ResourceRequest { externalDocumentURL }, options };
</span><span class="cx"> request.setInitiator(this);
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -70,7 +70,7 @@
</span><span class="cx"> ThreadableLoaderOptions options;
</span><span class="cx"> options.credentials = FetchOptions::Credentials::Include;
</span><span class="cx"> options.mode = mode;
</span><del>- options.setSendLoadCallbacks(SendCallbacks);
</del><ins>+ options.sendLoadCallbacks = SendCallbacks;
</ins><span class="cx"> options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
</span><span class="cx">
</span><span class="cx"> WorkerThreadableLoader::loadResourceSynchronously(downcast<WorkerGlobalScope>(scriptExecutionContext), WTFMove(*request), *this, options);
</span><span class="lines">@@ -93,7 +93,7 @@
</span><span class="cx"> ThreadableLoaderOptions options;
</span><span class="cx"> options.credentials = FetchOptions::Credentials::SameOrigin;
</span><span class="cx"> options.mode = mode;
</span><del>- options.setSendLoadCallbacks(SendCallbacks);
</del><ins>+ options.sendLoadCallbacks = SendCallbacks;
</ins><span class="cx"> options.contentSecurityPolicyEnforcement = contentSecurityPolicyEnforcement;
</span><span class="cx">
</span><span class="cx"> // During create, callbacks may happen which remove the last reference to this object.
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (204013 => 204014)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-08-02 06:42:18 UTC (rev 204013)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2016-08-02 06:46:57 UTC (rev 204014)
</span><span class="lines">@@ -687,8 +687,7 @@
</span><span class="cx"> request.setHTTPHeaderFields(m_requestHeaders);
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.setSendLoadCallbacks(SendCallbacks);
- options.setSniffContent(DoNotSniffContent);
</del><ins>+ options.sendLoadCallbacks = SendCallbacks;
</ins><span class="cx"> options.preflightPolicy = uploadEvents ? ForcePreflight : ConsiderPreflight;
</span><span class="cx"> options.credentials = m_includeCredentials ? FetchOptions::Credentials::Include : FetchOptions::Credentials::SameOrigin;
</span><span class="cx"> options.mode = FetchOptions::Mode::Cors;
</span></span></pre>
</div>
</div>
</body>
</html>