<!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>[202741] 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/202741">202741</a></dd>

<dt>Author</dt> <dd>commit-queue@webkit.org</dd>

<dt>Date</dt> <dd>2016-07-01 10:03:27 -0700 (Fri, 01 Jul 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Make ResourceLoaderOptions derive from FetchOptions

https://bugs.webkit.org/show_bug.cgi?id=159345

Patch by Youenn Fablet &lt;youenn@apple.com&gt; on 2016-07-01

Reviewed by Alex Christensen.

No change of behavior.

* Modules/fetch/FetchLoader.cpp:

(WebCore::FetchLoader::start):

* loader/CrossOriginPreflightChecker.cpp:

(WebCore::CrossOriginPreflightChecker::startPreflight):

* loader/ResourceLoaderOptions.h:

(WebCore::ResourceLoaderOptions::fetchOptions): Deleted.

(WebCore::ResourceLoaderOptions::setFetchOptions): Deleted.

* loader/SubresourceLoader.cpp:

(WebCore::SubresourceLoader::willSendRequestInternal):

* loader/ThreadableLoader.h: Removing securityOrigin field (left over from https://bugs.webkit.org/show_bug.cgi?id=159221)</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="#trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp">trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp</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="#trunkSourceWebCoreloaderThreadableLoaderh">trunk/Source/WebCore/loader/ThreadableLoader.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (202740 => 202741)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/ChangeLog        2016-07-01 17:00:48 UTC (rev 202740)

+++ trunk/Source/WebCore/ChangeLog        2016-07-01 17:03:27 UTC (rev 202741)

</span><span class="lines">@@ -1,3 +1,23 @@

</span><ins>+2016-07-01  Youenn Fablet  &lt;youenn@apple.com&gt;

+

+        Make ResourceLoaderOptions derive from FetchOptions

+        https://bugs.webkit.org/show_bug.cgi?id=159345

+

+        Reviewed by Alex Christensen.

+

+        No change of behavior.

+

+        * Modules/fetch/FetchLoader.cpp:

+        (WebCore::FetchLoader::start):

+        * loader/CrossOriginPreflightChecker.cpp:

+        (WebCore::CrossOriginPreflightChecker::startPreflight):

+        * loader/ResourceLoaderOptions.h:

+        (WebCore::ResourceLoaderOptions::fetchOptions): Deleted.

+        (WebCore::ResourceLoaderOptions::setFetchOptions): Deleted.

+        * loader/SubresourceLoader.cpp:

+        (WebCore::SubresourceLoader::willSendRequestInternal):

+        * loader/ThreadableLoader.h: Removing securityOrigin field (left over from https://bugs.webkit.org/show_bug.cgi?id=159221)

+

</ins><span class="cx"> 2016-07-01  Per Arne Vollan  &lt;pvollan@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         [Win] Animations tests are crashing in debug mode.

</span></span></pre></div>

<a id="trunkSourceWebCoreModulesfetchFetchLoadercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp (202740 => 202741)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp        2016-07-01 17:00:48 UTC (rev 202740)

+++ trunk/Source/WebCore/Modules/fetch/FetchLoader.cpp        2016-07-01 17:03:27 UTC (rev 202741)

</span><span class="lines">@@ -73,7 +73,6 @@

</span><span class="cx"> 

</span><span class="cx"> void FetchLoader::start(ScriptExecutionContext&amp; context, const FetchRequest&amp; request)

</span><span class="cx"> {

<del>-    // FIXME: Compute loading options according fetch options.

</del><span class="cx">     ThreadableLoaderOptions options;

</span><span class="cx">     options.setSendLoadCallbacks(SendCallbacks);

</span><span class="cx">     options.setSniffContent(DoNotSniffContent);

</span><span class="lines">@@ -82,8 +81,10 @@

</span><span class="cx">     options.setAllowCredentials(AllowStoredCredentials);

</span><span class="cx">     options.crossOriginRequestPolicy = DenyCrossOriginRequests;

</span><span class="cx">     options.contentSecurityPolicyEnforcement = ContentSecurityPolicyEnforcement::DoNotEnforce;

</span><del>-    options.setFetchOptions(request.fetchOptions());

</del><span class="cx"> 

<ins>+    // FIXME: Pass directly all fetch options to loader options.

+    options.redirect = request.fetchOptions().redirect;

+

</ins><span class="cx">     m_loader = ThreadableLoader::create(&amp;context, this, request.internalRequest(), options);

</span><span class="cx">     m_isStarted = m_loader;

</span><span class="cx"> }

</span></span></pre></div>

<a id="trunkSourceWebCoreloaderCrossOriginPreflightCheckercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp (202740 => 202741)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp        2016-07-01 17:00:48 UTC (rev 202740)

+++ trunk/Source/WebCore/loader/CrossOriginPreflightChecker.cpp        2016-07-01 17:03:27 UTC (rev 202741)

</span><span class="lines">@@ -109,7 +109,7 @@

<span class="cx">     // Keep buffering the data for the preflight request.

</span><span class="cx">     options.setDataBufferingPolicy(BufferData);

</span><span class="cx"> 

</span><del>-    options.fetchOptions().redirect = FetchOptions::Redirect::Manual;

</del><ins>+    options.redirect = FetchOptions::Redirect::Manual;

</ins><span class="cx"> 

</span><span class="cx">     CachedResourceRequest preflightRequest(createAccessControlPreflightRequest(m_request, m_loader.securityOrigin()), options);

</span><span class="cx">     if (RuntimeEnabledFeatures::sharedFeatures().resourceTimingEnabled())

</span></span></pre></div>

<a id="trunkSourceWebCoreloaderResourceLoaderOptionsh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoaderOptions.h (202740 => 202741)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/ResourceLoaderOptions.h        2016-07-01 17:00:48 UTC (rev 202740)

+++ trunk/Source/WebCore/loader/ResourceLoaderOptions.h        2016-07-01 17:03:27 UTC (rev 202741)

</span><span class="lines">@@ -28,14 +28,13 @@

<span class="cx">  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

</span><span class="cx">  */

</span><span class="cx"> 

</span><del>-#ifndef ResourceLoaderOptions_h

-#define ResourceLoaderOptions_h

</del><ins>+#pragma once

</ins><span class="cx"> 

</span><span class="cx"> #include &quot;FetchOptions.h&quot;

</span><span class="cx"> #include &quot;ResourceHandleTypes.h&quot;

</span><span class="cx"> 

</span><span class="cx"> namespace WebCore {

</span><del>-    

</del><ins>+

</ins><span class="cx"> enum SendCallbackPolicy {

</span><span class="cx">     SendCallbacks,

</span><span class="cx">     DoNotSendCallbacks

</span><span class="lines">@@ -82,7 +81,7 @@

</span><span class="cx">     DisallowCaching

</span><span class="cx"> };

</span><span class="cx"> 

</span><del>-struct ResourceLoaderOptions {

</del><ins>+struct ResourceLoaderOptions : public FetchOptions {

</ins><span class="cx">     ResourceLoaderOptions()

</span><span class="cx">         : m_sendLoadCallbacks(DoNotSendCallbacks)

</span><span class="cx">         , m_sniffContent(DoNotSniffContent)

</span><span class="lines">@@ -136,9 +135,6 @@

</span><span class="cx">     void setDefersLoadingPolicy(DefersLoadingPolicy defersLoadingPolicy) { m_defersLoadingPolicy = defersLoadingPolicy; }

</span><span class="cx">     CachingPolicy cachingPolicy() const { return m_cachingPolicy; }

</span><span class="cx">     void setCachingPolicy(CachingPolicy cachingPolicy) { m_cachingPolicy = cachingPolicy; }

</span><del>-    const FetchOptions&amp; fetchOptions() const { return m_fetchOptions; }

-    FetchOptions&amp; fetchOptions() { return m_fetchOptions; }

-    void setFetchOptions(const FetchOptions&amp; fetchOptions) { m_fetchOptions = fetchOptions; }

</del><span class="cx"> 

</span><span class="cx">     unsigned m_sendLoadCallbacks : 1;

</span><span class="cx">     unsigned m_sniffContent : 1;

</span><span class="lines">@@ -152,9 +148,6 @@

</span><span class="cx">     ContentSecurityPolicyImposition m_contentSecurityPolicyImposition { ContentSecurityPolicyImposition::DoPolicyCheck };

</span><span class="cx">     DefersLoadingPolicy m_defersLoadingPolicy { DefersLoadingPolicy::AllowDefersLoading };

</span><span class="cx">     CachingPolicy m_cachingPolicy { CachingPolicy::AllowCaching };

</span><del>-    FetchOptions m_fetchOptions;

</del><span class="cx"> };

</span><span class="cx"> 

</span><del>-} // namespace WebCore    

-

-#endif // ResourceLoaderOptions_h

</del><ins>+} // namespace WebCore

</ins></span></pre></div>

<a id="trunkSourceWebCoreloaderSubresourceLoadercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/SubresourceLoader.cpp (202740 => 202741)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/SubresourceLoader.cpp        2016-07-01 17:00:48 UTC (rev 202740)

+++ trunk/Source/WebCore/loader/SubresourceLoader.cpp        2016-07-01 17:03:27 UTC (rev 202741)

</span><span class="lines">@@ -175,8 +175,8 @@

</span><span class="cx"> 

</span><span class="cx">     ASSERT(!newRequest.isNull());

</span><span class="cx">     if (!redirectResponse.isNull()) {

</span><del>-        if (options().fetchOptions().redirect != FetchOptions::Redirect::Follow) {

-            if (options().fetchOptions().redirect == FetchOptions::Redirect::Error) {

</del><ins>+        if (options().redirect != FetchOptions::Redirect::Follow) {

+            if (options().redirect == FetchOptions::Redirect::Error) {

</ins><span class="cx">                 cancel();

</span><span class="cx">                 return;

</span><span class="cx">             }

</span></span></pre></div>

<a id="trunkSourceWebCoreloaderThreadableLoaderh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ThreadableLoader.h (202740 => 202741)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebCore/loader/ThreadableLoader.h        2016-07-01 17:00:48 UTC (rev 202740)

+++ trunk/Source/WebCore/loader/ThreadableLoader.h        2016-07-01 17:03:27 UTC (rev 202741)

</span><span class="lines">@@ -73,7 +73,6 @@

</span><span class="cx">         PreflightPolicy preflightPolicy { ConsiderPreflight };

</span><span class="cx">         CrossOriginRequestPolicy crossOriginRequestPolicy { DenyCrossOriginRequests };

</span><span class="cx">         ContentSecurityPolicyEnforcement contentSecurityPolicyEnforcement { ContentSecurityPolicyEnforcement::EnforceConnectSrcDirective };

</span><del>-        RefPtr&lt;SecurityOrigin&gt; securityOrigin;

</del><span class="cx">         String initiator; // This cannot be an AtomicString, as isolatedCopy() wouldn't create an object that's safe for passing to another thread.

</span><span class="cx">     };

</span><span class="cx"> 

</span></span></pre>

</div>

</div>

</body>

</html>