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

Side by Side Diff: third_party/WebKit/Source/platform/network/ResourceResponse.cpp

Issue 2272603003: Route key_exchange_group over to DevTools. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase again Created 4 years, 3 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) 2006, 2008 Apple Inc. All rights reserved. 2 * Copyright (C) 2006, 2008 Apple Inc. All rights reserved.
3 * Copyright (C) 2009 Google Inc. All rights reserved. 3 * Copyright (C) 2009 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
(...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after
161 setHTTPStatusText(AtomicString(data->m_httpStatusText)); 161 setHTTPStatusText(AtomicString(data->m_httpStatusText));
162 162
163 m_httpHeaderFields.adopt(std::move(data->m_httpHeaders)); 163 m_httpHeaderFields.adopt(std::move(data->m_httpHeaders));
164 setLastModifiedDate(data->m_lastModifiedDate); 164 setLastModifiedDate(data->m_lastModifiedDate);
165 setResourceLoadTiming(data->m_resourceLoadTiming.release()); 165 setResourceLoadTiming(data->m_resourceLoadTiming.release());
166 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors; 166 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors;
167 m_securityStyle = data->m_securityStyle; 167 m_securityStyle = data->m_securityStyle;
168 m_securityDetails.protocol = data->m_securityDetails.protocol; 168 m_securityDetails.protocol = data->m_securityDetails.protocol;
169 m_securityDetails.cipher = data->m_securityDetails.cipher; 169 m_securityDetails.cipher = data->m_securityDetails.cipher;
170 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange; 170 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange;
171 m_securityDetails.keyExchangeGroup = data->m_securityDetails.keyExchangeGrou p;
171 m_securityDetails.mac = data->m_securityDetails.mac; 172 m_securityDetails.mac = data->m_securityDetails.mac;
172 m_securityDetails.subjectName = data->m_securityDetails.subjectName; 173 m_securityDetails.subjectName = data->m_securityDetails.subjectName;
173 m_securityDetails.sanList = data->m_securityDetails.sanList; 174 m_securityDetails.sanList = data->m_securityDetails.sanList;
174 m_securityDetails.issuer = data->m_securityDetails.issuer; 175 m_securityDetails.issuer = data->m_securityDetails.issuer;
175 m_securityDetails.validFrom = data->m_securityDetails.validFrom; 176 m_securityDetails.validFrom = data->m_securityDetails.validFrom;
176 m_securityDetails.validTo = data->m_securityDetails.validTo; 177 m_securityDetails.validTo = data->m_securityDetails.validTo;
177 for (auto& cert : data->m_certificate) 178 for (auto& cert : data->m_certificate)
178 m_securityDetails.certificate.append(AtomicString(cert)); 179 m_securityDetails.certificate.append(AtomicString(cert));
179 m_securityDetails.sctList = data->m_securityDetails.sctList; 180 m_securityDetails.sctList = data->m_securityDetails.sctList;
180 m_httpVersion = data->m_httpVersion; 181 m_httpVersion = data->m_httpVersion;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
218 data->m_httpStatusText = httpStatusText().getString().isolatedCopy(); 219 data->m_httpStatusText = httpStatusText().getString().isolatedCopy();
219 data->m_httpHeaders = httpHeaderFields().copyData(); 220 data->m_httpHeaders = httpHeaderFields().copyData();
220 data->m_lastModifiedDate = lastModifiedDate(); 221 data->m_lastModifiedDate = lastModifiedDate();
221 if (m_resourceLoadTiming) 222 if (m_resourceLoadTiming)
222 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); 223 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy();
223 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; 224 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors;
224 data->m_securityStyle = m_securityStyle; 225 data->m_securityStyle = m_securityStyle;
225 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy() ; 226 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy() ;
226 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); 227 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy();
227 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated Copy(); 228 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated Copy();
229 data->m_securityDetails.keyExchangeGroup = m_securityDetails.keyExchangeGrou p.isolatedCopy();
228 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); 230 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy();
229 data->m_securityDetails.subjectName = m_securityDetails.subjectName.isolated Copy(); 231 data->m_securityDetails.subjectName = m_securityDetails.subjectName.isolated Copy();
230 data->m_securityDetails.sanList = isolatedCopy(m_securityDetails.sanList); 232 data->m_securityDetails.sanList = isolatedCopy(m_securityDetails.sanList);
231 data->m_securityDetails.issuer = m_securityDetails.issuer.isolatedCopy(); 233 data->m_securityDetails.issuer = m_securityDetails.issuer.isolatedCopy();
232 data->m_securityDetails.validFrom = m_securityDetails.validFrom; 234 data->m_securityDetails.validFrom = m_securityDetails.validFrom;
233 data->m_securityDetails.validTo = m_securityDetails.validTo; 235 data->m_securityDetails.validTo = m_securityDetails.validTo;
234 for (auto& cert : m_securityDetails.certificate) 236 for (auto& cert : m_securityDetails.certificate)
235 data->m_certificate.append(cert.getString().isolatedCopy()); 237 data->m_certificate.append(cert.getString().isolatedCopy());
236 data->m_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList); 238 data->m_securityDetails.sctList = isolatedCopy(m_securityDetails.sctList);
237 data->m_httpVersion = m_httpVersion; 239 data->m_httpVersion = m_httpVersion;
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 else if (equalIgnoringCase(name, cacheControlHeaderString()) || equalIgnorin gCase(name, pragmaHeaderString())) 383 else if (equalIgnoringCase(name, cacheControlHeaderString()) || equalIgnorin gCase(name, pragmaHeaderString()))
382 m_cacheControlHeader = CacheControlHeader(); 384 m_cacheControlHeader = CacheControlHeader();
383 else if (equalIgnoringCase(name, dateHeader)) 385 else if (equalIgnoringCase(name, dateHeader))
384 m_haveParsedDateHeader = false; 386 m_haveParsedDateHeader = false;
385 else if (equalIgnoringCase(name, expiresHeader)) 387 else if (equalIgnoringCase(name, expiresHeader))
386 m_haveParsedExpiresHeader = false; 388 m_haveParsedExpiresHeader = false;
387 else if (equalIgnoringCase(name, lastModifiedHeader)) 389 else if (equalIgnoringCase(name, lastModifiedHeader))
388 m_haveParsedLastModifiedHeader = false; 390 m_haveParsedLastModifiedHeader = false;
389 } 391 }
390 392
391 void ResourceResponse::setSecurityDetails(const String& protocol, const String& keyExchange, const String& cipher, const String& mac, const String& subjectName, const Vector<String>& sanList, const String& issuer, time_t validFrom, time_t v alidTo, const Vector<AtomicString>& certificate, const SignedCertificateTimestam pList& sctList) 393 void ResourceResponse::setSecurityDetails(const String& protocol, const String& keyExchange, const String& keyExchangeGroup, const String& cipher, const String& mac, const String& subjectName, const Vector<String>& sanList, const String& is suer, time_t validFrom, time_t validTo, const Vector<AtomicString>& certificate, const SignedCertificateTimestampList& sctList)
392 { 394 {
393 m_securityDetails.protocol = protocol; 395 m_securityDetails.protocol = protocol;
394 m_securityDetails.keyExchange = keyExchange; 396 m_securityDetails.keyExchange = keyExchange;
397 m_securityDetails.keyExchangeGroup = keyExchangeGroup;
395 m_securityDetails.cipher = cipher; 398 m_securityDetails.cipher = cipher;
396 m_securityDetails.mac = mac; 399 m_securityDetails.mac = mac;
397 m_securityDetails.subjectName = subjectName; 400 m_securityDetails.subjectName = subjectName;
398 m_securityDetails.sanList = sanList; 401 m_securityDetails.sanList = sanList;
399 m_securityDetails.issuer = issuer; 402 m_securityDetails.issuer = issuer;
400 m_securityDetails.validFrom = validFrom; 403 m_securityDetails.validFrom = validFrom;
401 m_securityDetails.validTo = validTo; 404 m_securityDetails.validTo = validTo;
402 m_securityDetails.certificate = certificate; 405 m_securityDetails.certificate = certificate;
403 m_securityDetails.sctList = sctList; 406 m_securityDetails.sctList = sctList;
404 } 407 }
(...skipping 245 matching lines...) Expand 10 before | Expand all | Expand 10 after
650 if (a.resourceLoadTiming() != b.resourceLoadTiming()) 653 if (a.resourceLoadTiming() != b.resourceLoadTiming())
651 return false; 654 return false;
652 if (a.encodedBodyLength() != b.encodedBodyLength()) 655 if (a.encodedBodyLength() != b.encodedBodyLength())
653 return false; 656 return false;
654 if (a.decodedBodyLength() != b.decodedBodyLength()) 657 if (a.decodedBodyLength() != b.decodedBodyLength())
655 return false; 658 return false;
656 return true; 659 return true;
657 } 660 }
658 661
659 } // namespace blink 662 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/network/ResourceResponse.h ('k') | third_party/WebKit/public/platform/WebURLResponse.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698