OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2012 Google, Inc. All rights reserved. | 2 * Copyright (C) 2012 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 | 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 Loading... |
30 #include "core/fetch/ResourceFetcher.h" | 30 #include "core/fetch/ResourceFetcher.h" |
31 | 31 |
32 namespace blink { | 32 namespace blink { |
33 | 33 |
34 FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const AtomicS
tring& initiator, const String& charset, ResourceLoadPriority priority) | 34 FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const AtomicS
tring& initiator, const String& charset, ResourceLoadPriority priority) |
35 : m_resourceRequest(resourceRequest) | 35 : m_resourceRequest(resourceRequest) |
36 , m_charset(charset) | 36 , m_charset(charset) |
37 , m_options(ResourceFetcher::defaultResourceOptions()) | 37 , m_options(ResourceFetcher::defaultResourceOptions()) |
38 , m_priority(priority) | 38 , m_priority(priority) |
39 , m_forPreload(false) | 39 , m_forPreload(false) |
| 40 , m_execAsync(false) |
40 , m_defer(NoDefer) | 41 , m_defer(NoDefer) |
41 , m_originRestriction(UseDefaultOriginRestrictionForType) | 42 , m_originRestriction(UseDefaultOriginRestrictionForType) |
42 { | 43 { |
43 m_options.initiatorInfo.name = initiator; | 44 m_options.initiatorInfo.name = initiator; |
44 } | 45 } |
45 | 46 |
46 FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const AtomicS
tring& initiator, const ResourceLoaderOptions& options) | 47 FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const AtomicS
tring& initiator, const ResourceLoaderOptions& options) |
47 : m_resourceRequest(resourceRequest) | 48 : m_resourceRequest(resourceRequest) |
48 , m_options(options) | 49 , m_options(options) |
49 , m_priority(ResourceLoadPriorityUnresolved) | 50 , m_priority(ResourceLoadPriorityUnresolved) |
50 , m_forPreload(false) | 51 , m_forPreload(false) |
| 52 , m_execAsync(false) |
51 , m_defer(NoDefer) | 53 , m_defer(NoDefer) |
52 , m_originRestriction(UseDefaultOriginRestrictionForType) | 54 , m_originRestriction(UseDefaultOriginRestrictionForType) |
53 { | 55 { |
54 m_options.initiatorInfo.name = initiator; | 56 m_options.initiatorInfo.name = initiator; |
55 } | 57 } |
56 | 58 |
57 FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const FetchIn
itiatorInfo& initiator) | 59 FetchRequest::FetchRequest(const ResourceRequest& resourceRequest, const FetchIn
itiatorInfo& initiator) |
58 : m_resourceRequest(resourceRequest) | 60 : m_resourceRequest(resourceRequest) |
59 , m_options(ResourceFetcher::defaultResourceOptions()) | 61 , m_options(ResourceFetcher::defaultResourceOptions()) |
60 , m_priority(ResourceLoadPriorityUnresolved) | 62 , m_priority(ResourceLoadPriorityUnresolved) |
61 , m_forPreload(false) | 63 , m_forPreload(false) |
| 64 , m_execAsync(false) |
62 , m_defer(NoDefer) | 65 , m_defer(NoDefer) |
63 , m_originRestriction(UseDefaultOriginRestrictionForType) | 66 , m_originRestriction(UseDefaultOriginRestrictionForType) |
64 { | 67 { |
65 m_options.initiatorInfo = initiator; | 68 m_options.initiatorInfo = initiator; |
66 } | 69 } |
67 | 70 |
68 FetchRequest::~FetchRequest() | 71 FetchRequest::~FetchRequest() |
69 { | 72 { |
70 } | 73 } |
71 | 74 |
(...skipping 11 matching lines...) Expand all Loading... |
83 { | 86 { |
84 setCrossOriginAccessControl(origin, allowCredentials, allowCredentials == Al
lowStoredCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentia
ls); | 87 setCrossOriginAccessControl(origin, allowCredentials, allowCredentials == Al
lowStoredCredentials ? ClientRequestedCredentials : ClientDidNotRequestCredentia
ls); |
85 } | 88 } |
86 | 89 |
87 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const Ato
micString& crossOriginMode) | 90 void FetchRequest::setCrossOriginAccessControl(SecurityOrigin* origin, const Ato
micString& crossOriginMode) |
88 { | 91 { |
89 setCrossOriginAccessControl(origin, equalIgnoringCase(crossOriginMode, "use-
credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials); | 92 setCrossOriginAccessControl(origin, equalIgnoringCase(crossOriginMode, "use-
credentials") ? AllowStoredCredentials : DoNotAllowStoredCredentials); |
90 } | 93 } |
91 | 94 |
92 } // namespace blink | 95 } // namespace blink |
OLD | NEW |