<!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>[170381] trunk/Source</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/170381">170381</a></dd>
<dt>Author</dt> <dd>bfulgham@apple.com</dd>
<dt>Date</dt> <dd>2014-06-24 12:49:25 -0700 (Tue, 24 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Win] MSVC mishandles enums in bitfields
https://bugs.webkit.org/show_bug.cgi?id=134237
Reviewed by Michael Saboff.
Replace uses of enum types in bit fields with unsigned to
avoid losing a bit to hold the sign value. This can result
in Windows interpreting the value of the field improperly.
../JavaScriptCore:
* bytecode/StructureStubInfo.h:
* parser/Nodes.h:
../WebCore:
* loader/ResourceLoaderOptions.h:
* platform/network/ResourceRequestBase.h:
* platform/network/cf/ResourceResponse.h:
* rendering/RenderLayer.h:
* rendering/RenderMarquee.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecodeStructureStubInfoh">trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h</a></li>
<li><a href="#trunkSourceJavaScriptCorebytecompilerNodesCodegencpp">trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreparserNodesh">trunk/Source/JavaScriptCore/parser/Nodes.h</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</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="#trunkSourceWebCorecssStyleResolvercpp">trunk/Source/WebCore/css/StyleResolver.cpp</a></li>
<li><a href="#trunkSourceWebCorefileapiFileReaderLoadercpp">trunk/Source/WebCore/fileapi/FileReaderLoader.cpp</a></li>
<li><a href="#trunkSourceWebCoreinspectorInspectorResourceAgentcpp">trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp</a></li>
<li><a href="#trunkSourceWebCoreloaderDocumentThreadableLoadercpp">trunk/Source/WebCore/loader/DocumentThreadableLoader.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="#trunkSourceWebCoreloadercacheCachedImagecpp">trunk/Source/WebCore/loader/cache/CachedImage.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="#trunkSourceWebCoreloadercacheCachedTextTrackcpp">trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp</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="#trunkSourceWebCoreplatformnetworkResourceRequestBasecpp">trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkResourceRequestBaseh">trunk/Source/WebCore/platform/network/ResourceRequestBase.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkcfResourceResponseh">trunk/Source/WebCore/platform/network/cf/ResourceResponse.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayercpp">trunk/Source/WebCore/rendering/RenderLayer.cpp</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderLayerh">trunk/Source/WebCore/rendering/RenderLayer.h</a></li>
<li><a href="#trunkSourceWebCorerenderingRenderMarqueeh">trunk/Source/WebCore/rendering/RenderMarquee.h</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="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/JavaScriptCore/ChangeLog 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-06-24 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] MSVC mishandles enums in bitfields
+ https://bugs.webkit.org/show_bug.cgi?id=134237
+
+ Reviewed by Michael Saboff.
+
+ Replace uses of enum types in bit fields with unsigned to
+ avoid losing a bit to hold the sign value. This can result
+ in Windows interpreting the value of the field improperly.
+
+ * bytecode/StructureStubInfo.h:
+ * parser/Nodes.h:
+
</ins><span class="cx"> 2014-06-23 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Inline the UnlinkedInstructionStream::Reader logic.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecodeStructureStubInfoh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/JavaScriptCore/bytecode/StructureStubInfo.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -200,7 +200,7 @@
</span><span class="cx"> CodeOrigin codeOrigin;
</span><span class="cx">
</span><span class="cx"> struct {
</span><del>- SpillRegistersMode spillMode : 8;
</del><ins>+ unsigned spillMode : 8;
</ins><span class="cx"> int8_t baseGPR;
</span><span class="cx"> #if USE(JSVALUE32_64)
</span><span class="cx"> int8_t valueTagGPR;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorebytecompilerNodesCodegencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/JavaScriptCore/bytecompiler/NodesCodegen.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -1484,7 +1484,7 @@
</span><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(subexpressionDivot(), subexpressionStart(), subexpressionEnd());
</span><span class="cx"> RefPtr<RegisterID> value = generator.emitGetById(generator.tempDestination(dst), base.get(), m_ident);
</span><del>- RegisterID* updatedValue = emitReadModifyAssignment(generator, generator.finalDestination(dst, value.get()), value.get(), m_right, m_operator, OperandTypes(ResultType::unknownType(), m_right->resultDescriptor()));
</del><ins>+ RegisterID* updatedValue = emitReadModifyAssignment(generator, generator.finalDestination(dst, value.get()), value.get(), m_right, static_cast<JSC::Operator>(m_operator), OperandTypes(ResultType::unknownType(), m_right->resultDescriptor()));
</ins><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><span class="cx"> return generator.emitPutById(base.get(), m_ident, updatedValue);
</span><span class="lines">@@ -1521,7 +1521,7 @@
</span><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(subexpressionDivot(), subexpressionStart(), subexpressionEnd());
</span><span class="cx"> RefPtr<RegisterID> value = generator.emitGetByVal(generator.tempDestination(dst), base.get(), property.get());
</span><del>- RegisterID* updatedValue = emitReadModifyAssignment(generator, generator.finalDestination(dst, value.get()), value.get(), m_right, m_operator, OperandTypes(ResultType::unknownType(), m_right->resultDescriptor()));
</del><ins>+ RegisterID* updatedValue = emitReadModifyAssignment(generator, generator.finalDestination(dst, value.get()), value.get(), m_right, static_cast<JSC::Operator>(m_operator), OperandTypes(ResultType::unknownType(), m_right->resultDescriptor()));
</ins><span class="cx">
</span><span class="cx"> generator.emitExpressionInfo(divot(), divotStart(), divotEnd());
</span><span class="cx"> generator.emitPutByVal(base.get(), property.get(), updatedValue);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreparserNodesh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/parser/Nodes.h (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/parser/Nodes.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/JavaScriptCore/parser/Nodes.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -1040,7 +1040,7 @@
</span><span class="cx"> ExpressionNode* m_base;
</span><span class="cx"> ExpressionNode* m_subscript;
</span><span class="cx"> ExpressionNode* m_right;
</span><del>- Operator m_operator : 30;
</del><ins>+ unsigned m_operator : 30;
</ins><span class="cx"> bool m_subscriptHasAssignments : 1;
</span><span class="cx"> bool m_rightHasAssignments : 1;
</span><span class="cx"> };
</span><span class="lines">@@ -1082,7 +1082,7 @@
</span><span class="cx"> ExpressionNode* m_base;
</span><span class="cx"> const Identifier& m_ident;
</span><span class="cx"> ExpressionNode* m_right;
</span><del>- Operator m_operator : 31;
</del><ins>+ unsigned m_operator : 31;
</ins><span class="cx"> bool m_rightHasAssignments : 1;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/ChangeLog 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2014-06-24 Brent Fulgham <bfulgham@apple.com>
+
+ [Win] MSVC mishandles enums in bitfields
+ https://bugs.webkit.org/show_bug.cgi?id=134237
+
+ Reviewed by Michael Saboff.
+
+ Replace uses of enum types in bit fields with unsigned to
+ avoid losing a bit to hold the sign value. This can result
+ in Windows interpreting the value of the field improperly.
+
+ * loader/ResourceLoaderOptions.h:
+ * platform/network/ResourceRequestBase.h:
+ * platform/network/cf/ResourceResponse.h:
+ * rendering/RenderLayer.h:
+ * rendering/RenderMarquee.h:
+
</ins><span class="cx"> 2014-06-24 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix build.
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageSetValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageSetValue.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageSetValue.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/css/CSSImageSetValue.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -121,8 +121,8 @@
</span><span class="cx"> ImageWithScale image = bestImageForScaleFactor();
</span><span class="cx"> CachedResourceRequest request(ResourceRequest(document->completeURL(image.imageURL)), options);
</span><span class="cx"> request.setInitiator(cachedResourceRequestInitiators().css);
</span><del>- if (options.requestOriginPolicy == PotentiallyCrossOriginEnabled)
- updateRequestForAccessControl(request.mutableResourceRequest(), document->securityOrigin(), options.allowCredentials);
</del><ins>+ if (options.requestOriginPolicy() == PotentiallyCrossOriginEnabled)
+ updateRequestForAccessControl(request.mutableResourceRequest(), document->securityOrigin(), options.allowCredentials());
</ins><span class="cx"> if (CachedResourceHandle<CachedImage> cachedImage = loader->requestImage(request)) {
</span><span class="cx"> detachPendingImage();
</span><span class="cx"> m_imageSet = StyleCachedImageSet::create(cachedImage.get(), image.scaleFactor, this);
</span></span></pre></div>
<a id="trunkSourceWebCorecssCSSImageValuecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/CSSImageValue.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/CSSImageValue.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/css/CSSImageValue.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -84,8 +84,8 @@
</span><span class="cx"> else
</span><span class="cx"> request.setInitiator(m_initiatorName);
</span><span class="cx">
</span><del>- if (options.requestOriginPolicy == PotentiallyCrossOriginEnabled)
- updateRequestForAccessControl(request.mutableResourceRequest(), loader->document()->securityOrigin(), options.allowCredentials);
</del><ins>+ if (options.requestOriginPolicy() == PotentiallyCrossOriginEnabled)
+ 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="trunkSourceWebCorecssStyleResolvercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/css/StyleResolver.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/css/StyleResolver.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/css/StyleResolver.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -3536,8 +3536,8 @@
</span><span class="cx"> auto& pendingImage = toStylePendingImage(*image);
</span><span class="cx">
</span><span class="cx"> ResourceLoaderOptions options = CachedResourceLoader::defaultCachedResourceOptions();
</span><del>- options.requestOriginPolicy = PotentiallyCrossOriginEnabled;
- options.allowCredentials = DoNotAllowStoredCredentials;
</del><ins>+ options.setRequestOriginPolicy(PotentiallyCrossOriginEnabled);
+ options.setAllowCredentials(DoNotAllowStoredCredentials);
</ins><span class="cx">
</span><span class="cx"> shapeValue->setImage(loadPendingImage(pendingImage, options));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorefileapiFileReaderLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/fileapi/FileReaderLoader.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/fileapi/FileReaderLoader.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -92,10 +92,10 @@
</span><span class="cx"> request.setHTTPHeaderField(HTTPHeaderName::Range, String::format("bytes=%d-%d", m_rangeStart, m_rangeEnd));
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.sendLoadCallbacks = SendCallbacks;
- options.sniffContent = DoNotSniffContent;
</del><ins>+ options.setSendLoadCallbacks(SendCallbacks);
+ options.setSniffContent(DoNotSniffContent);
</ins><span class="cx"> options.preflightPolicy = ConsiderPreflight;
</span><del>- options.allowCredentials = AllowStoredCredentials;
</del><ins>+ options.setAllowCredentials(AllowStoredCredentials);
</ins><span class="cx"> options.crossOriginRequestPolicy = DenyCrossOriginRequests;
</span><span class="cx">
</span><span class="cx"> if (m_client)
</span></span></pre></div>
<a id="trunkSourceWebCoreinspectorInspectorResourceAgentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/inspector/InspectorResourceAgent.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -760,8 +760,8 @@
</span><span class="cx"> request.setHiddenFromInspector(true);
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.sendLoadCallbacks = SendCallbacks; // So we remove this from m_hiddenRequestIdentifiers on completion.
- options.allowCredentials = AllowStoredCredentials;
</del><ins>+ options.setSendLoadCallbacks(SendCallbacks); // So we remove this from m_hiddenRequestIdentifiers on completion.
+ options.setAllowCredentials(AllowStoredCredentials);
</ins><span class="cx"> options.crossOriginRequestPolicy = AllowCrossOriginRequests;
</span><span class="cx">
</span><span class="cx"> // InspectorThreadableLoaderClient deletes itself when the load completes.
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderDocumentThreadableLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/DocumentThreadableLoader.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx"> ASSERT(m_options.crossOriginRequestPolicy == UseAccessControl);
</span><span class="cx">
</span><span class="cx"> OwnPtr<ResourceRequest> crossOriginRequest = adoptPtr(new ResourceRequest(request));
</span><del>- updateRequestForAccessControl(*crossOriginRequest, securityOrigin(), m_options.allowCredentials);
</del><ins>+ updateRequestForAccessControl(*crossOriginRequest, securityOrigin(), m_options.allowCredentials());
</ins><span class="cx">
</span><span class="cx"> if ((m_options.preflightPolicy == ConsiderPreflight && isSimpleCrossOriginAccessRequest(crossOriginRequest->httpMethod(), crossOriginRequest->httpHeaderFields())) || m_options.preflightPolicy == PreventPreflight)
</span><span class="cx"> makeSimpleCrossOriginAccessRequest(*crossOriginRequest);
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> m_simpleRequest = false;
</span><span class="cx"> m_actualRequest = crossOriginRequest.release();
</span><span class="cx">
</span><del>- if (CrossOriginPreflightResultCache::shared().canSkipPreflight(securityOrigin()->toString(), m_actualRequest->url(), m_options.allowCredentials, m_actualRequest->httpMethod(), m_actualRequest->httpHeaderFields()))
</del><ins>+ if (CrossOriginPreflightResultCache::shared().canSkipPreflight(securityOrigin()->toString(), m_actualRequest->url(), m_options.allowCredentials(), m_actualRequest->httpMethod(), m_actualRequest->httpHeaderFields()))
</ins><span class="cx"> preflightSuccess();
</span><span class="cx"> else
</span><span class="cx"> makeCrossOriginAccessRequestWithPreflight(*m_actualRequest);
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> allowRedirect = SchemeRegistry::shouldTreatURLSchemeAsCORSEnabled(request.url().protocol())
</span><span class="cx"> && request.url().user().isEmpty()
</span><span class="cx"> && request.url().pass().isEmpty()
</span><del>- && passesAccessControlCheck(redirectResponse, m_options.allowCredentials, securityOrigin(), accessControlErrorDescription);
</del><ins>+ && 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">@@ -247,12 +247,12 @@
</span><span class="cx"> InspectorInstrumentation::didReceiveResourceResponse(cookie, identifier, loader, response, 0);
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (!passesAccessControlCheck(response, m_options.allowCredentials, securityOrigin(), accessControlErrorDescription)) {
</del><ins>+ if (!passesAccessControlCheck(response, m_options.allowCredentials(), securityOrigin(), accessControlErrorDescription)) {
</ins><span class="cx"> preflightFailure(identifier, response.url(), accessControlErrorDescription);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- StoredCredentials allowCredentials = m_options.allowCredentials;
</del><ins>+ StoredCredentials allowCredentials = m_options.allowCredentials();
</ins><span class="cx"> auto preflightResult = std::make_unique<CrossOriginPreflightResultCacheItem>(allowCredentials);
</span><span class="cx"> if (!preflightResult->parse(response, accessControlErrorDescription)
</span><span class="cx"> || !preflightResult->allowsCrossOriginMethod(m_actualRequest->httpMethod(), accessControlErrorDescription)
</span><span class="lines">@@ -264,7 +264,7 @@
</span><span class="cx"> CrossOriginPreflightResultCache::shared().appendEntry(securityOrigin()->toString(), m_actualRequest->url(), std::move(preflightResult));
</span><span class="cx"> } else {
</span><span class="cx"> if (!m_sameOriginRequest && m_options.crossOriginRequestPolicy == UseAccessControl) {
</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->didFailAccessControlCheck(ResourceError(errorDomainWebKitInternal, 0, response.url().string(), accessControlErrorDescription));
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="lines">@@ -363,19 +363,19 @@
</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.securityCheck = securityCheck;
</del><ins>+ m_options.setSecurityCheck(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="cx"> if (m_async) {
</span><span class="cx"> ThreadableLoaderOptions options = m_options;
</span><del>- options.clientCredentialPolicy = DoNotAskClientForCrossOriginCredentials;
</del><ins>+ options.setClientCredentialPolicy(DoNotAskClientForCrossOriginCredentials);
</ins><span class="cx"> if (m_actualRequest) {
</span><span class="cx"> // Don't sniff content or send load callbacks for the preflight request.
</span><del>- options.sendLoadCallbacks = DoNotSendCallbacks;
- options.sniffContent = DoNotSniffContent;
</del><ins>+ options.setSendLoadCallbacks(DoNotSendCallbacks);
+ options.setSniffContent(DoNotSniffContent);
</ins><span class="cx"> // Keep buffering the data for the preflight request.
</span><del>- options.dataBufferingPolicy = BufferData;
</del><ins>+ options.setDataBufferingPolicy(BufferData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResourceRequest newRequest(request, options);
</span><span class="lines">@@ -402,7 +402,7 @@
</span><span class="cx"> ResourceResponse response;
</span><span class="cx"> unsigned long identifier = std::numeric_limits<unsigned long>::max();
</span><span class="cx"> if (m_document.frame())
</span><del>- identifier = m_document.frame()->loader().loadResourceSynchronously(request, m_options.allowCredentials, m_options.clientCredentialPolicy, error, response, data);
</del><ins>+ identifier = m_document.frame()->loader().loadResourceSynchronously(request, m_options.allowCredentials(), m_options.clientCredentialPolicy(), error, response, data);
</ins><span class="cx">
</span><span class="cx"> InspectorInstrumentation::documentThreadableLoaderStartedLoadingForClient(&m_document, identifier, m_client);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/ResourceLoader.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> m_defersLoading = m_frame->page()->defersLoading();
</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">@@ -174,7 +174,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_reachedTerminalState)
</span><del>- m_handle = ResourceHandle::create(m_frame->loader().networkingContext(), m_request, this, m_defersLoading, m_options.sniffContent == SniffContent);
</del><ins>+ m_handle = ResourceHandle::create(m_frame->loader().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="lines">@@ -200,7 +200,7 @@
</span><span class="cx">
</span><span class="cx"> void ResourceLoader::setDataBufferingPolicy(DataBufferingPolicy dataBufferingPolicy)
</span><span class="cx"> {
</span><del>- m_options.dataBufferingPolicy = dataBufferingPolicy;
</del><ins>+ m_options.setDataBufferingPolicy(dataBufferingPolicy);
</ins><span class="cx">
</span><span class="cx"> // Reset any already buffered data
</span><span class="cx"> if (dataBufferingPolicy == DoNotBufferData)
</span><span class="lines">@@ -217,7 +217,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 (dataPayloadType == DataPayloadWholeResource) {
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> createdResourceIdentifier = true;
</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">@@ -312,7 +312,7 @@
</span><span class="cx"> if (FormData* data = m_request.httpBody())
</span><span class="cx"> data->removeGeneratedFilesIfNeeded();
</span><span class="cx">
</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">@@ -347,7 +347,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, buffer ? buffer->data() : data, buffer ? buffer->size() : length, static_cast<int>(encodedDataLength));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -373,7 +373,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">@@ -399,7 +399,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">@@ -536,7 +536,7 @@
</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><span class="cx">
</span><span class="cx"> Ref<ResourceLoader> protect(*this);
</span><span class="lines">@@ -551,8 +551,8 @@
</span><span class="cx"> // anything including possibly derefing this; one example of this is Radar 3266216.
</span><span class="cx"> Ref<ResourceLoader> protect(*this);
</span><span class="cx">
</span><del>- if (m_options.allowCredentials == AllowStoredCredentials) {
- if (m_options.clientCredentialPolicy == AskClientForAllCredentials || (m_options.clientCredentialPolicy == DoNotAskClientForCrossOriginCredentials && m_frame->document()->securityOrigin()->canRequest(originalRequest().url()))) {
</del><ins>+ if (m_options.allowCredentials() == AllowStoredCredentials) {
+ if (m_options.clientCredentialPolicy() == AskClientForAllCredentials || (m_options.clientCredentialPolicy() == DoNotAskClientForCrossOriginCredentials && m_frame->document()->securityOrigin()->canRequest(originalRequest().url()))) {
</ins><span class="cx"> frameLoader()->notifier().didReceiveAuthenticationChallenge(this, challenge);
</span><span class="cx"> return;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloaderResourceLoaderh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/ResourceLoader.h (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoader.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/ResourceLoader.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -119,10 +119,10 @@
</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.sendLoadCallbacks = sendLoadCallbacks; }
- bool shouldSniffContent() const { return m_options.sniffContent == SniffContent; }
- ClientCredentialPolicy clientCredentialPolicy() const { return m_options.clientCredentialPolicy; }
</del><ins>+ bool shouldSendResourceLoadCallbacks() const { return m_options.sendLoadCallbacks() == SendCallbacks; }
+ void setSendCallbackPolicy(SendCallbackPolicy sendLoadCallbacks) { m_options.setSendLoadCallbacks(sendLoadCallbacks); }
+ bool shouldSniffContent() const { return m_options.sniffContent() == SniffContent; }
+ ClientCredentialPolicy clientCredentialPolicy() const { return m_options.clientCredentialPolicy(); }
</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 (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/ResourceLoaderOptions.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/ResourceLoaderOptions.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -63,33 +63,49 @@
</span><span class="cx">
</span><span class="cx"> struct ResourceLoaderOptions {
</span><span class="cx"> ResourceLoaderOptions()
</span><del>- : sendLoadCallbacks(DoNotSendCallbacks)
- , sniffContent(DoNotSniffContent)
- , dataBufferingPolicy(BufferData)
- , allowCredentials(DoNotAllowStoredCredentials)
- , clientCredentialPolicy(DoNotAskClientForAnyCredentials)
- , securityCheck(DoSecurityCheck)
- , requestOriginPolicy(UseDefaultOriginRestrictionsForType)
</del><ins>+ : m_sendLoadCallbacks(DoNotSendCallbacks)
+ , m_sniffContent(DoNotSniffContent)
+ , m_dataBufferingPolicy(BufferData)
+ , m_allowCredentials(DoNotAllowStoredCredentials)
+ , m_clientCredentialPolicy(DoNotAskClientForAnyCredentials)
+ , m_securityCheck(DoSecurityCheck)
+ , m_requestOriginPolicy(UseDefaultOriginRestrictionsForType)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ResourceLoaderOptions(SendCallbackPolicy sendLoadCallbacks, ContentSniffingPolicy sniffContent, DataBufferingPolicy dataBufferingPolicy, StoredCredentials allowCredentials, ClientCredentialPolicy credentialPolicy, SecurityCheckPolicy securityCheck, RequestOriginPolicy requestOriginPolicy)
</span><del>- : sendLoadCallbacks(sendLoadCallbacks)
- , sniffContent(sniffContent)
- , dataBufferingPolicy(dataBufferingPolicy)
- , allowCredentials(allowCredentials)
- , clientCredentialPolicy(credentialPolicy)
- , securityCheck(securityCheck)
- , requestOriginPolicy(requestOriginPolicy)
</del><ins>+ : m_sendLoadCallbacks(sendLoadCallbacks)
+ , m_sniffContent(sniffContent)
+ , m_dataBufferingPolicy(dataBufferingPolicy)
+ , m_allowCredentials(allowCredentials)
+ , m_clientCredentialPolicy(credentialPolicy)
+ , m_securityCheck(securityCheck)
+ , m_requestOriginPolicy(requestOriginPolicy)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><del>- SendCallbackPolicy sendLoadCallbacks : 1;
- ContentSniffingPolicy sniffContent : 1;
- DataBufferingPolicy dataBufferingPolicy : 1;
- StoredCredentials allowCredentials : 1; // Whether HTTP credentials and cookies are sent with the request.
- ClientCredentialPolicy clientCredentialPolicy : 2; // When we should ask the client for credentials (if we allow credentials at all).
- SecurityCheckPolicy securityCheck : 1;
- RequestOriginPolicy requestOriginPolicy : 2;
</del><ins>+
+ 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; }
+ ClientCredentialPolicy clientCredentialPolicy() const { return static_cast<ClientCredentialPolicy>(m_clientCredentialPolicy); }
+ void setClientCredentialPolicy(ClientCredentialPolicy policy) { m_clientCredentialPolicy = policy; }
+ SecurityCheckPolicy securityCheck() const { return static_cast<SecurityCheckPolicy>(m_securityCheck); }
+ void setSecurityCheck(SecurityCheckPolicy check) { m_securityCheck = check; }
+ RequestOriginPolicy requestOriginPolicy() const { return static_cast<RequestOriginPolicy>(m_requestOriginPolicy); }
+ void setRequestOriginPolicy(RequestOriginPolicy policy) { m_requestOriginPolicy = policy; }
+
+ 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_clientCredentialPolicy : 2; // When we should ask the client for credentials (if we allow credentials at all).
+ unsigned m_securityCheck : 1;
+ unsigned m_requestOriginPolicy : 2;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedImagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedImage.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/cache/CachedImage.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -416,13 +416,13 @@
</span><span class="cx">
</span><span class="cx"> void CachedImage::addDataBuffer(ResourceBuffer* data)
</span><span class="cx"> {
</span><del>- ASSERT(m_options.dataBufferingPolicy == BufferData);
</del><ins>+ ASSERT(m_options.dataBufferingPolicy() == BufferData);
</ins><span class="cx"> addIncrementalDataBuffer(data);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedImage::addData(const char* data, unsigned length)
</span><span class="cx"> {
</span><del>- ASSERT(m_options.dataBufferingPolicy == DoNotBufferData);
</del><ins>+ ASSERT(m_options.dataBufferingPolicy() == DoNotBufferData);
</ins><span class="cx"> addIncrementalDataBuffer(ResourceBuffer::create(data, length).get());
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedRawResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedRawResource.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/cache/CachedRawResource.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -60,7 +60,7 @@
</span><span class="cx"> void CachedRawResource::addDataBuffer(ResourceBuffer* data)
</span><span class="cx"> {
</span><span class="cx"> CachedResourceHandle<CachedRawResource> protect(this);
</span><del>- ASSERT(m_options.dataBufferingPolicy == BufferData);
</del><ins>+ ASSERT(m_options.dataBufferingPolicy() == BufferData);
</ins><span class="cx"> m_data = data;
</span><span class="cx">
</span><span class="cx"> unsigned incrementalDataLength;
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> if (data)
</span><span class="cx"> setEncodedSize(data->size());
</span><span class="cx"> notifyClientsDataWasReceived(incrementalData, incrementalDataLength);
</span><del>- if (m_options.dataBufferingPolicy == DoNotBufferData) {
</del><ins>+ if (m_options.dataBufferingPolicy() == DoNotBufferData) {
</ins><span class="cx"> if (m_loader)
</span><span class="cx"> m_loader->setDataBufferingPolicy(DoNotBufferData);
</span><span class="cx"> clear();
</span><span class="lines">@@ -77,14 +77,14 @@
</span><span class="cx">
</span><span class="cx"> void CachedRawResource::addData(const char* data, unsigned length)
</span><span class="cx"> {
</span><del>- ASSERT(m_options.dataBufferingPolicy == DoNotBufferData);
</del><ins>+ ASSERT(m_options.dataBufferingPolicy() == DoNotBufferData);
</ins><span class="cx"> notifyClientsDataWasReceived(data, length);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedRawResource::finishLoading(ResourceBuffer* data)
</span><span class="cx"> {
</span><span class="cx"> CachedResourceHandle<CachedRawResource> protect(this);
</span><del>- DataBufferingPolicy dataBufferingPolicy = m_options.dataBufferingPolicy;
</del><ins>+ DataBufferingPolicy dataBufferingPolicy = m_options.dataBufferingPolicy();
</ins><span class="cx"> if (dataBufferingPolicy == BufferData) {
</span><span class="cx"> m_data = data;
</span><span class="cx">
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CachedResource::finishLoading(data);
</span><del>- if (dataBufferingPolicy == BufferData && m_options.dataBufferingPolicy == DoNotBufferData) {
</del><ins>+ if (dataBufferingPolicy == BufferData && m_options.dataBufferingPolicy() == DoNotBufferData) {
</ins><span class="cx"> if (m_loader)
</span><span class="cx"> m_loader->setDataBufferingPolicy(DoNotBufferData);
</span><span class="cx"> clear();
</span><span class="lines">@@ -197,7 +197,7 @@
</span><span class="cx">
</span><span class="cx"> void CachedRawResource::setDataBufferingPolicy(DataBufferingPolicy dataBufferingPolicy)
</span><span class="cx"> {
</span><del>- m_options.dataBufferingPolicy = dataBufferingPolicy;
</del><ins>+ m_options.setDataBufferingPolicy(dataBufferingPolicy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static bool shouldIgnoreHeaderForCacheReuse(const String& headerName)
</span><span class="lines">@@ -223,7 +223,7 @@
</span><span class="cx">
</span><span class="cx"> bool CachedRawResource::canReuse(const ResourceRequest& newRequest) const
</span><span class="cx"> {
</span><del>- if (m_options.dataBufferingPolicy == DoNotBufferData)
</del><ins>+ if (m_options.dataBufferingPolicy() == DoNotBufferData)
</ins><span class="cx"> return false;
</span><span class="cx">
</span><span class="cx"> if (m_resourceRequest.httpMethod() != newRequest.httpMethod())
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/cache/CachedResource.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -258,7 +258,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> FrameLoader& frameLoader = cachedResourceLoader->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 class="lines">@@ -336,12 +336,12 @@
</span><span class="cx">
</span><span class="cx"> void CachedResource::addDataBuffer(ResourceBuffer*)
</span><span class="cx"> {
</span><del>- ASSERT(m_options.dataBufferingPolicy == BufferData);
</del><ins>+ ASSERT(m_options.dataBufferingPolicy() == BufferData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedResource::addData(const char*, unsigned)
</span><span class="cx"> {
</span><del>- ASSERT(m_options.dataBufferingPolicy == DoNotBufferData);
</del><ins>+ ASSERT(m_options.dataBufferingPolicy() == DoNotBufferData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void CachedResource::finishLoading(ResourceBuffer*)
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedResourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedResource.h (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResource.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/cache/CachedResource.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -210,8 +210,8 @@
</span><span class="cx"> bool errorOccurred() const { return m_status == LoadError || m_status == DecodeError; }
</span><span class="cx"> bool loadFailedOrCanceled() { 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><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 (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/cache/CachedResourceLoader.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx"> #if ENABLE(VIDEO_TRACK)
</span><span class="cx"> case CachedResource::TextTrackResource:
</span><span class="cx"> #endif
</span><del>- if (options.requestOriginPolicy == RestrictToSameOrigin && !m_document->securityOrigin()->canRequest(url)) {
</del><ins>+ if (options.requestOriginPolicy() == RestrictToSameOrigin && !m_document->securityOrigin()->canRequest(url)) {
</ins><span class="cx"> printAccessDeniedMessage(url);
</span><span class="cx"> return false;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercacheCachedTextTrackcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/cache/CachedTextTrack.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> void CachedTextTrack::addDataBuffer(ResourceBuffer* data)
</span><span class="cx"> {
</span><del>- ASSERT(m_options.dataBufferingPolicy == BufferData);
</del><ins>+ ASSERT(m_options.dataBufferingPolicy() == BufferData);
</ins><span class="cx"> m_data = data;
</span><span class="cx"> setEncodedSize(m_data.get() ? m_data->size() : 0);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreloadercfResourceLoaderCFNetcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/cf/ResourceLoaderCFNet.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</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 0;
</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 (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/loader/mac/ResourceLoaderMac.mm 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> CFCachedURLResponseRef ResourceLoader::willCacheResponse(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 0;
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSCachedURLResponse> nsCachedResponse = adoptNS([[NSCachedURLResponse alloc] _initWithCFCachedURLResponse:cachedResponse]);
</span><span class="lines">@@ -61,7 +61,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 0;
</span><span class="cx"> return frameLoader()->client().willCacheResponse(documentLoader(), identifier(), response);
</span><span class="cx"> }
</span><span class="lines">@@ -81,7 +81,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 = ResourceBuffer::create();
</span><span class="cx"> m_resourceData->append(data);
</span><span class="lines">@@ -90,7 +90,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 (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventSource.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/page/EventSource.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -128,12 +128,12 @@
</span><span class="cx"> SecurityOrigin* origin = scriptExecutionContext()->securityOrigin();
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.sendLoadCallbacks = SendCallbacks;
- options.sniffContent = DoNotSniffContent;
- options.allowCredentials = (origin->canRequest(m_url) || m_withCredentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</del><ins>+ options.setSendLoadCallbacks(SendCallbacks);
+ options.setSniffContent(DoNotSniffContent);
+ options.setAllowCredentials((origin->canRequest(m_url) || m_withCredentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials);
</ins><span class="cx"> options.preflightPolicy = PreventPreflight;
</span><span class="cx"> options.crossOriginRequestPolicy = UseAccessControl;
</span><del>- options.dataBufferingPolicy = DoNotBufferData;
</del><ins>+ options.setDataBufferingPolicy(DoNotBufferData);
</ins><span class="cx"> options.securityOrigin = origin;
</span><span class="cx">
</span><span class="cx"> m_loader = ThreadableLoader::create(scriptExecutionContext(), this, request, options);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBasecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -150,7 +150,7 @@
</span><span class="cx"> {
</span><span class="cx"> updateResourceRequest();
</span><span class="cx">
</span><del>- return m_cachePolicy;
</del><ins>+ return static_cast<ResourceRequestCachePolicy>(m_cachePolicy);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ResourceRequestBase::setCachePolicy(ResourceRequestCachePolicy cachePolicy)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkResourceRequestBaseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/ResourceRequestBase.h (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/platform/network/ResourceRequestBase.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -219,7 +219,7 @@
</span><span class="cx"> HTTPHeaderMap m_httpHeaderFields;
</span><span class="cx"> Vector<String> m_responseContentDispositionEncodingFallbackArray;
</span><span class="cx"> RefPtr<FormData> m_httpBody;
</span><del>- ResourceRequestCachePolicy m_cachePolicy : 3;
</del><ins>+ unsigned m_cachePolicy : 3;
</ins><span class="cx"> bool m_allowCookies : 1;
</span><span class="cx"> mutable bool m_resourceRequestUpdated : 1;
</span><span class="cx"> mutable bool m_platformRequestUpdated : 1;
</span><span class="lines">@@ -231,7 +231,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx"> bool m_hiddenFromInspector : 1;
</span><span class="cx"> #endif
</span><del>- ResourceLoadPriority m_priority : 4;
</del><ins>+ ResourceLoadPriority m_priority : 4; // not unsigned because ResourceLoadPriority has negative values
</ins><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> const ResourceRequest& asResourceRequest() const;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkcfResourceResponseh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/cf/ResourceResponse.h (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/platform/network/cf/ResourceResponse.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -111,7 +111,7 @@
</span><span class="cx">
</span><span class="cx"> static bool platformCompare(const ResourceResponse& a, const ResourceResponse& b);
</span><span class="cx">
</span><del>- InitLevel m_initLevel : 3;
</del><ins>+ unsigned m_initLevel : 3;
</ins><span class="cx"> bool m_platformResponseIsUpToDate : 1;
</span><span class="cx">
</span><span class="cx"> #if USE(CFNETWORK)
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/rendering/RenderLayer.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -1666,7 +1666,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> if (hasBlendMode())
</span><del>- context->setCompositeOperation(context->compositeOperation(), m_blendMode);
</del><ins>+ context->setCompositeOperation(context->compositeOperation(), blendMode());
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> context->beginTransparencyLayer(renderer().opacity());
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderLayerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderLayer.h (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderLayer.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/rendering/RenderLayer.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -800,7 +800,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><span class="cx"> bool hasBlendMode() const { return renderer().hasBlendMode(); }
</span><del>- BlendMode blendMode() const { return m_blendMode; }
</del><ins>+ BlendMode blendMode() const { return static_cast<BlendMode>(m_blendMode); }
</ins><span class="cx">
</span><span class="cx"> bool isolatesCompositedBlending() const { return m_hasNotIsolatedCompositedBlendingDescendants && isStackingContext(); }
</span><span class="cx"> bool hasNotIsolatedCompositedBlendingDescendants() const { return m_hasNotIsolatedCompositedBlendingDescendants; }
</span><span class="lines">@@ -1272,7 +1272,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CSS_COMPOSITING)
</span><del>- BlendMode m_blendMode : 5;
</del><ins>+ unsigned m_blendMode : 5;
</ins><span class="cx"> bool m_hasNotIsolatedCompositedBlendingDescendants : 1;
</span><span class="cx"> bool m_hasNotIsolatedBlendingDescendants : 1;
</span><span class="cx"> bool m_hasNotIsolatedBlendingDescendantsStatusDirty : 1;
</span></span></pre></div>
<a id="trunkSourceWebCorerenderingRenderMarqueeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/rendering/RenderMarquee.h (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/rendering/RenderMarquee.h 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/rendering/RenderMarquee.h 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> bool m_reset: 1;
</span><span class="cx"> bool m_suspended : 1;
</span><span class="cx"> bool m_stopped : 1;
</span><del>- EMarqueeDirection m_direction : 4;
</del><ins>+ EMarqueeDirection m_direction : 4; // Not unsigned because EMarqueeDirection has negative values
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="trunkSourceWebCoreworkersWorkerScriptLoadercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/workers/WorkerScriptLoader.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/workers/WorkerScriptLoader.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -64,9 +64,9 @@
</span><span class="cx"> ASSERT_WITH_SECURITY_IMPLICATION(scriptExecutionContext->isWorkerGlobalScope());
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.allowCredentials = AllowStoredCredentials;
</del><ins>+ options.setAllowCredentials(AllowStoredCredentials);
</ins><span class="cx"> options.crossOriginRequestPolicy = crossOriginRequestPolicy;
</span><del>- options.sendLoadCallbacks = SendCallbacks;
</del><ins>+ options.setSendLoadCallbacks(SendCallbacks);
</ins><span class="cx">
</span><span class="cx"> WorkerThreadableLoader::loadResourceSynchronously(toWorkerGlobalScope(scriptExecutionContext), *request, *this, options);
</span><span class="cx"> }
</span><span class="lines">@@ -82,9 +82,9 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.allowCredentials = AllowStoredCredentials;
</del><ins>+ options.setAllowCredentials(AllowStoredCredentials);
</ins><span class="cx"> options.crossOriginRequestPolicy = crossOriginRequestPolicy;
</span><del>- options.sendLoadCallbacks = SendCallbacks;
</del><ins>+ options.setSendLoadCallbacks(SendCallbacks);
</ins><span class="cx">
</span><span class="cx"> // During create, callbacks may happen which remove the last reference to this object.
</span><span class="cx"> Ref<WorkerScriptLoader> protect(*this);
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (170380 => 170381)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-24 19:38:01 UTC (rev 170380)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2014-06-24 19:49:25 UTC (rev 170381)
</span><span class="lines">@@ -756,10 +756,10 @@
</span><span class="cx"> request.setHTTPHeaderFields(m_requestHeaders);
</span><span class="cx">
</span><span class="cx"> ThreadableLoaderOptions options;
</span><del>- options.sendLoadCallbacks = SendCallbacks;
- options.sniffContent = DoNotSniffContent;
</del><ins>+ options.setSendLoadCallbacks(SendCallbacks);
+ options.setSniffContent(DoNotSniffContent);
</ins><span class="cx"> options.preflightPolicy = uploadEvents ? ForcePreflight : ConsiderPreflight;
</span><del>- options.allowCredentials = (m_sameOriginRequest || m_includeCredentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials;
</del><ins>+ options.setAllowCredentials((m_sameOriginRequest || m_includeCredentials) ? AllowStoredCredentials : DoNotAllowStoredCredentials);
</ins><span class="cx"> options.crossOriginRequestPolicy = UseAccessControl;
</span><span class="cx"> options.securityOrigin = securityOrigin();
</span><span class="cx"> #if ENABLE(RESOURCE_TIMING)
</span></span></pre>
</div>
</div>
</body>
</html>