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

Side by Side Diff: third_party/WebKit/Source/core/fetch/Resource.cpp

Issue 1839473002: Centralize the setting of Accept headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 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
OLDNEW
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 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
198 visitor->trace(m_cacheHandler); 198 visitor->trace(m_cacheHandler);
199 #endif 199 #endif
200 } 200 }
201 201
202 void Resource::load(ResourceFetcher* fetcher) 202 void Resource::load(ResourceFetcher* fetcher)
203 { 203 {
204 RELEASE_ASSERT(!m_loader); 204 RELEASE_ASSERT(!m_loader);
205 m_status = Pending; 205 m_status = Pending;
206 206
207 ResourceRequest& request(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest); 207 ResourceRequest& request(m_revalidatingRequest.isNull() ? m_resourceRequest : m_revalidatingRequest);
208 if (!accept().isEmpty())
209 request.setHTTPAccept(accept());
210 request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredC redentials); 208 request.setAllowStoredCredentials(m_options.allowCredentials == AllowStoredC redentials);
211 209
212 // FIXME: It's unfortunate that the cache layer and below get to know anythi ng about fragment identifiers. 210 // FIXME: It's unfortunate that the cache layer and below get to know anythi ng about fragment identifiers.
213 // We should look into removing the expectation of that knowledge from the p latform network stacks. 211 // We should look into removing the expectation of that knowledge from the p latform network stacks.
214 KURL urlWithoutFragment = request.url(); 212 KURL urlWithoutFragment = request.url();
215 if (!m_fragmentIdentifierForRequest.isNull()) { 213 if (!m_fragmentIdentifierForRequest.isNull()) {
216 KURL url = request.url(); 214 KURL url = request.url();
217 url.setFragmentIdentifier(m_fragmentIdentifierForRequest); 215 url.setFragmentIdentifier(m_fragmentIdentifierForRequest);
218 request.setURL(url); 216 request.setURL(url);
219 m_fragmentIdentifierForRequest = String(); 217 m_fragmentIdentifierForRequest = String();
(...skipping 867 matching lines...) Expand 10 before | Expand all | Expand 10 after
1087 case Resource::Media: 1085 case Resource::Media:
1088 return "Media"; 1086 return "Media";
1089 case Resource::Manifest: 1087 case Resource::Manifest:
1090 return "Manifest"; 1088 return "Manifest";
1091 } 1089 }
1092 ASSERT_NOT_REACHED(); 1090 ASSERT_NOT_REACHED();
1093 return "Unknown"; 1091 return "Unknown";
1094 } 1092 }
1095 1093
1096 } // namespace blink 1094 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698