OLD | NEW |
1 /* | 1 /* |
2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) | 2 Copyright (C) 1998 Lars Knoll (knoll@mpi-hd.mpg.de) |
3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) | 3 Copyright (C) 2001 Dirk Mueller (mueller@kde.org) |
4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) | 4 Copyright (C) 2002 Waldo Bastian (bastian@kde.org) |
5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) | 5 Copyright (C) 2006 Samuel Weinig (sam.weinig@gmail.com) |
6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. | 6 Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Apple Inc. All
rights reserved. |
7 | 7 |
8 This library is free software; you can redistribute it and/or | 8 This library is free software; you can redistribute it and/or |
9 modify it under the terms of the GNU Library General Public | 9 modify it under the terms of the GNU Library General Public |
10 License as published by the Free Software Foundation; either | 10 License as published by the Free Software Foundation; either |
(...skipping 186 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
197 visitor->trace(m_cacheHandler); | 197 visitor->trace(m_cacheHandler); |
198 #endif | 198 #endif |
199 } | 199 } |
200 | 200 |
201 void Resource::load(ResourceFetcher* fetcher) | 201 void Resource::load(ResourceFetcher* fetcher) |
202 { | 202 { |
203 RELEASE_ASSERT(!m_loader); | 203 RELEASE_ASSERT(!m_loader); |
204 m_status = Pending; | 204 m_status = Pending; |
205 | 205 |
206 ResourceRequest& request(m_revalidatingRequest.isNull() ? m_resourceRequest
: m_revalidatingRequest); | 206 ResourceRequest& request(m_revalidatingRequest.isNull() ? m_resourceRequest
: m_revalidatingRequest); |
207 if (!accept().isEmpty()) | |
208 request.setHTTPAccept(accept()); | |
209 request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredC
redentials); | 207 request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredC
redentials); |
210 | 208 |
211 // FIXME: It's unfortunate that the cache layer and below get to know anythi
ng about fragment identifiers. | 209 // FIXME: It's unfortunate that the cache layer and below get to know anythi
ng about fragment identifiers. |
212 // We should look into removing the expectation of that knowledge from the p
latform network stacks. | 210 // We should look into removing the expectation of that knowledge from the p
latform network stacks. |
213 KURL urlWithoutFragment = request.url(); | 211 KURL urlWithoutFragment = request.url(); |
214 if (!m_fragmentIdentifierForRequest.isNull()) { | 212 if (!m_fragmentIdentifierForRequest.isNull()) { |
215 KURL url = request.url(); | 213 KURL url = request.url(); |
216 url.setFragmentIdentifier(m_fragmentIdentifierForRequest); | 214 url.setFragmentIdentifier(m_fragmentIdentifierForRequest); |
217 request.setURL(url); | 215 request.setURL(url); |
218 m_fragmentIdentifierForRequest = String(); | 216 m_fragmentIdentifierForRequest = String(); |
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1086 case Resource::Media: | 1084 case Resource::Media: |
1087 return "Media"; | 1085 return "Media"; |
1088 case Resource::Manifest: | 1086 case Resource::Manifest: |
1089 return "Manifest"; | 1087 return "Manifest"; |
1090 } | 1088 } |
1091 ASSERT_NOT_REACHED(); | 1089 ASSERT_NOT_REACHED(); |
1092 return "Unknown"; | 1090 return "Unknown"; |
1093 } | 1091 } |
1094 | 1092 |
1095 } // namespace blink | 1093 } // namespace blink |
OLD | NEW |