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

Side by Side Diff: Source/core/fetch/CrossOriginAccessControl.cpp

Issue 1088843002: Add #include <algorithm> to code that is missing it. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: And no more comments Created 5 years, 8 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/dom/DOMStringList.cpp ('k') | Source/core/layout/ColumnInfo.h » ('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) 2008 Apple Inc. All Rights Reserved. 2 * Copyright (C) 2008 Apple 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 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 19 matching lines...) Expand all
30 #include "core/fetch/Resource.h" 30 #include "core/fetch/Resource.h"
31 #include "core/fetch/ResourceLoaderOptions.h" 31 #include "core/fetch/ResourceLoaderOptions.h"
32 #include "platform/network/HTTPParsers.h" 32 #include "platform/network/HTTPParsers.h"
33 #include "platform/network/ResourceRequest.h" 33 #include "platform/network/ResourceRequest.h"
34 #include "platform/network/ResourceResponse.h" 34 #include "platform/network/ResourceResponse.h"
35 #include "platform/weborigin/SchemeRegistry.h" 35 #include "platform/weborigin/SchemeRegistry.h"
36 #include "platform/weborigin/SecurityOrigin.h" 36 #include "platform/weborigin/SecurityOrigin.h"
37 #include "wtf/Threading.h" 37 #include "wtf/Threading.h"
38 #include "wtf/text/AtomicString.h" 38 #include "wtf/text/AtomicString.h"
39 #include "wtf/text/StringBuilder.h" 39 #include "wtf/text/StringBuilder.h"
40 #include <algorithm>
40 41
41 namespace blink { 42 namespace blink {
42 43
43 static PassOwnPtr<HTTPHeaderSet> createAllowedCrossOriginResponseHeadersSet() 44 static PassOwnPtr<HTTPHeaderSet> createAllowedCrossOriginResponseHeadersSet()
44 { 45 {
45 OwnPtr<HTTPHeaderSet> headerSet = adoptPtr(new HashSet<String, CaseFoldingHa sh>); 46 OwnPtr<HTTPHeaderSet> headerSet = adoptPtr(new HashSet<String, CaseFoldingHa sh>);
46 47
47 headerSet->add("cache-control"); 48 headerSet->add("cache-control");
48 headerSet->add("content-language"); 49 headerSet->add("content-language");
49 headerSet->add("content-type"); 50 headerSet->add("content-type");
(...skipping 205 matching lines...) Expand 10 before | Expand all | Expand 10 after
255 request.setHTTPOrigin(securityOrigin->toAtomicString()); 256 request.setHTTPOrigin(securityOrigin->toAtomicString());
256 // If the user didn't request credentials in the first place, update our 257 // If the user didn't request credentials in the first place, update our
257 // state so we neither request them nor expect they must be allowed. 258 // state so we neither request them nor expect they must be allowed.
258 if (options.credentialsRequested == ClientDidNotRequestCredentials) 259 if (options.credentialsRequested == ClientDidNotRequestCredentials)
259 options.allowCredentials = DoNotAllowStoredCredentials; 260 options.allowCredentials = DoNotAllowStoredCredentials;
260 } 261 }
261 return true; 262 return true;
262 } 263 }
263 264
264 } // namespace blink 265 } // namespace blink
OLDNEW
« no previous file with comments | « Source/core/dom/DOMStringList.cpp ('k') | Source/core/layout/ColumnInfo.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698