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

Side by Side Diff: third_party/WebKit/Source/platform/loader/fetch/ResourceRequest.cpp

Issue 2746113002: platform/loader: move network/Resource* to loader/fetch (Closed)
Patch Set: git rebase master Created 3 years, 9 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2003, 2006 Apple Computer, Inc. All rights reserved.
3 * Copyright (C) 2009, 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2009, 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
11 * notice, this list of conditions and the following disclaimer in the 11 * notice, this list of conditions and the following disclaimer in the
12 * documentation and/or other materials provided with the distribution. 12 * documentation and/or other materials provided with the distribution.
13 * 13 *
14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY 14 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY
15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE 15 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR 16 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR 17 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR
18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, 18 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, 19 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR 20 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY 21 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 22 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 24 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
25 */ 25 */
26 26
27 #include "platform/network/ResourceRequest.h" 27 #include "platform/loader/fetch/ResourceRequest.h"
28 28
29 #include <memory>
29 #include "platform/HTTPNames.h" 30 #include "platform/HTTPNames.h"
30 #include "platform/RuntimeEnabledFeatures.h" 31 #include "platform/RuntimeEnabledFeatures.h"
31 #include "platform/network/NetworkUtils.h" 32 #include "platform/network/NetworkUtils.h"
32 #include "platform/weborigin/SecurityOrigin.h" 33 #include "platform/weborigin/SecurityOrigin.h"
33 #include "public/platform/WebAddressSpace.h" 34 #include "public/platform/WebAddressSpace.h"
34 #include "public/platform/WebCachePolicy.h" 35 #include "public/platform/WebCachePolicy.h"
35 #include "public/platform/WebURLRequest.h" 36 #include "public/platform/WebURLRequest.h"
36 #include "wtf/PtrUtil.h" 37 #include "wtf/PtrUtil.h"
37 #include <memory>
38 38
39 namespace blink { 39 namespace blink {
40 40
41 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX; 41 double ResourceRequest::s_defaultTimeoutInterval = INT_MAX;
42 42
43 ResourceRequest::ResourceRequest() : ResourceRequest(KURL()) {} 43 ResourceRequest::ResourceRequest() : ResourceRequest(KURL()) {}
44 44
45 ResourceRequest::ResourceRequest(const String& urlString) 45 ResourceRequest::ResourceRequest(const String& urlString)
46 : ResourceRequest(KURL(ParsedURLString, urlString)) {} 46 : ResourceRequest(KURL(ParsedURLString, urlString)) {}
47 47
(...skipping 329 matching lines...) Expand 10 before | Expand all | Expand 10 after
377 m_httpHeaderFields.contains(HTTPNames::If_None_Match) || 377 m_httpHeaderFields.contains(HTTPNames::If_None_Match) ||
378 m_httpHeaderFields.contains(HTTPNames::If_Range) || 378 m_httpHeaderFields.contains(HTTPNames::If_Range) ||
379 m_httpHeaderFields.contains(HTTPNames::If_Unmodified_Since)); 379 m_httpHeaderFields.contains(HTTPNames::If_Unmodified_Since));
380 } 380 }
381 381
382 void ResourceRequest::setHasUserGesture(bool hasUserGesture) { 382 void ResourceRequest::setHasUserGesture(bool hasUserGesture) {
383 m_hasUserGesture |= hasUserGesture; 383 m_hasUserGesture |= hasUserGesture;
384 } 384 }
385 385
386 const CacheControlHeader& ResourceRequest::cacheControlHeader() const { 386 const CacheControlHeader& ResourceRequest::cacheControlHeader() const {
387 if (!m_cacheControlHeaderCache.parsed) 387 if (!m_cacheControlHeaderCache.parsed) {
388 m_cacheControlHeaderCache = parseCacheControlDirectives( 388 m_cacheControlHeaderCache = parseCacheControlDirectives(
389 m_httpHeaderFields.get(HTTPNames::Cache_Control), 389 m_httpHeaderFields.get(HTTPNames::Cache_Control),
390 m_httpHeaderFields.get(HTTPNames::Pragma)); 390 m_httpHeaderFields.get(HTTPNames::Pragma));
391 }
391 return m_cacheControlHeaderCache; 392 return m_cacheControlHeaderCache;
392 } 393 }
393 394
394 bool ResourceRequest::cacheControlContainsNoCache() const { 395 bool ResourceRequest::cacheControlContainsNoCache() const {
395 return cacheControlHeader().containsNoCache; 396 return cacheControlHeader().containsNoCache;
396 } 397 }
397 398
398 bool ResourceRequest::cacheControlContainsNoStore() const { 399 bool ResourceRequest::cacheControlContainsNoStore() const {
399 return cacheControlHeader().containsNoStore; 400 return cacheControlHeader().containsNoStore;
400 } 401 }
(...skipping 15 matching lines...) Expand all
416 // layer. 417 // layer.
417 if (httpMethod() == HTTPNames::GET || httpMethod() == HTTPNames::HEAD) 418 if (httpMethod() == HTTPNames::GET || httpMethod() == HTTPNames::HEAD)
418 return false; 419 return false;
419 420
420 // For non-GET and non-HEAD methods, always send an Origin header so the 421 // For non-GET and non-HEAD methods, always send an Origin header so the
421 // server knows we support this feature. 422 // server knows we support this feature.
422 return true; 423 return true;
423 } 424 }
424 425
425 } // namespace blink 426 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698