Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(33)

Side by Side Diff: Source/core/fetch/ResourceLoaderOptions.h

Issue 583903003: [Thread-safe] Take isolatedCopy of SecurityOrigin in ResourceLoaderOptions when passed across thread (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/fetch/ResourceLoaderOptionsTest.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 explicit CrossThreadResourceLoaderOptionsData(const ResourceLoaderOptions& o ptions) 151 explicit CrossThreadResourceLoaderOptionsData(const ResourceLoaderOptions& o ptions)
152 : dataBufferingPolicy(options.dataBufferingPolicy) 152 : dataBufferingPolicy(options.dataBufferingPolicy)
153 , allowCredentials(options.allowCredentials) 153 , allowCredentials(options.allowCredentials)
154 , credentialsRequested(options.credentialsRequested) 154 , credentialsRequested(options.credentialsRequested)
155 , contentSecurityPolicyOption(options.contentSecurityPolicyOption) 155 , contentSecurityPolicyOption(options.contentSecurityPolicyOption)
156 , initiatorInfo(options.initiatorInfo) 156 , initiatorInfo(options.initiatorInfo)
157 , requestInitiatorContext(options.requestInitiatorContext) 157 , requestInitiatorContext(options.requestInitiatorContext)
158 , mixedContentBlockingTreatment(options.mixedContentBlockingTreatment) 158 , mixedContentBlockingTreatment(options.mixedContentBlockingTreatment)
159 , synchronousPolicy(options.synchronousPolicy) 159 , synchronousPolicy(options.synchronousPolicy)
160 , corsEnabled(options.corsEnabled) 160 , corsEnabled(options.corsEnabled)
161 , securityOrigin(options.securityOrigin) { } 161 , securityOrigin(options.securityOrigin ? options.securityOrigin->isolat edCopy() : nullptr) { }
162 162
163 operator ResourceLoaderOptions() const 163 operator ResourceLoaderOptions() const
164 { 164 {
165 ResourceLoaderOptions options; 165 ResourceLoaderOptions options;
166 options.dataBufferingPolicy = dataBufferingPolicy; 166 options.dataBufferingPolicy = dataBufferingPolicy;
167 options.allowCredentials = allowCredentials; 167 options.allowCredentials = allowCredentials;
168 options.credentialsRequested = credentialsRequested; 168 options.credentialsRequested = credentialsRequested;
169 options.contentSecurityPolicyOption = contentSecurityPolicyOption; 169 options.contentSecurityPolicyOption = contentSecurityPolicyOption;
170 options.initiatorInfo = initiatorInfo; 170 options.initiatorInfo = initiatorInfo;
171 options.requestInitiatorContext = requestInitiatorContext; 171 options.requestInitiatorContext = requestInitiatorContext;
(...skipping 20 matching lines...) Expand all
192 typedef CrossThreadResourceLoaderOptionsData Type; 192 typedef CrossThreadResourceLoaderOptionsData Type;
193 static Type copy(const ResourceLoaderOptions& options) 193 static Type copy(const ResourceLoaderOptions& options)
194 { 194 {
195 return CrossThreadResourceLoaderOptionsData(options); 195 return CrossThreadResourceLoaderOptionsData(options);
196 } 196 }
197 }; 197 };
198 198
199 } // namespace blink 199 } // namespace blink
200 200
201 #endif // ResourceLoaderOptions_h 201 #endif // ResourceLoaderOptions_h
OLDNEW
« no previous file with comments | « Source/core/core.gypi ('k') | Source/core/fetch/ResourceLoaderOptionsTest.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698