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

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

Issue 2315443003: Stop sending serialized SSLStatus to the renderer. (Closed)
Patch Set: self review fix and merge fix 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
156 setExpectedContentLength(data->m_expectedContentLength); 156 setExpectedContentLength(data->m_expectedContentLength);
157 setTextEncodingName(AtomicString(data->m_textEncodingName)); 157 setTextEncodingName(AtomicString(data->m_textEncodingName));
158 setSuggestedFilename(data->m_suggestedFilename); 158 setSuggestedFilename(data->m_suggestedFilename);
159 159
160 setHTTPStatusCode(data->m_httpStatusCode); 160 setHTTPStatusCode(data->m_httpStatusCode);
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_securityInfo = data->m_securityInfo;
167 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors; 166 m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors;
168 m_securityStyle = data->m_securityStyle; 167 m_securityStyle = data->m_securityStyle;
169 m_securityDetails.protocol = data->m_securityDetails.protocol; 168 m_securityDetails.protocol = data->m_securityDetails.protocol;
170 m_securityDetails.cipher = data->m_securityDetails.cipher; 169 m_securityDetails.cipher = data->m_securityDetails.cipher;
171 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange; 170 m_securityDetails.keyExchange = data->m_securityDetails.keyExchange;
172 m_securityDetails.mac = data->m_securityDetails.mac; 171 m_securityDetails.mac = data->m_securityDetails.mac;
173 m_securityDetails.subjectName = data->m_securityDetails.subjectName; 172 m_securityDetails.subjectName = data->m_securityDetails.subjectName;
174 m_securityDetails.sanList = data->m_securityDetails.sanList; 173 m_securityDetails.sanList = data->m_securityDetails.sanList;
175 m_securityDetails.issuer = data->m_securityDetails.issuer; 174 m_securityDetails.issuer = data->m_securityDetails.issuer;
176 m_securityDetails.validFrom = data->m_securityDetails.validFrom; 175 m_securityDetails.validFrom = data->m_securityDetails.validFrom;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
214 data->m_mimeType = mimeType().getString().isolatedCopy(); 213 data->m_mimeType = mimeType().getString().isolatedCopy();
215 data->m_expectedContentLength = expectedContentLength(); 214 data->m_expectedContentLength = expectedContentLength();
216 data->m_textEncodingName = textEncodingName().getString().isolatedCopy(); 215 data->m_textEncodingName = textEncodingName().getString().isolatedCopy();
217 data->m_suggestedFilename = suggestedFilename().isolatedCopy(); 216 data->m_suggestedFilename = suggestedFilename().isolatedCopy();
218 data->m_httpStatusCode = httpStatusCode(); 217 data->m_httpStatusCode = httpStatusCode();
219 data->m_httpStatusText = httpStatusText().getString().isolatedCopy(); 218 data->m_httpStatusText = httpStatusText().getString().isolatedCopy();
220 data->m_httpHeaders = httpHeaderFields().copyData(); 219 data->m_httpHeaders = httpHeaderFields().copyData();
221 data->m_lastModifiedDate = lastModifiedDate(); 220 data->m_lastModifiedDate = lastModifiedDate();
222 if (m_resourceLoadTiming) 221 if (m_resourceLoadTiming)
223 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); 222 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy();
224 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length( ));
225 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors; 223 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors;
226 data->m_securityStyle = m_securityStyle; 224 data->m_securityStyle = m_securityStyle;
227 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy() ; 225 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy() ;
228 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); 226 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy();
229 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated Copy(); 227 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated Copy();
230 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); 228 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy();
231 data->m_securityDetails.subjectName = m_securityDetails.subjectName.isolated Copy(); 229 data->m_securityDetails.subjectName = m_securityDetails.subjectName.isolated Copy();
232 data->m_securityDetails.sanList = isolatedCopy(m_securityDetails.sanList); 230 data->m_securityDetails.sanList = isolatedCopy(m_securityDetails.sanList);
233 data->m_securityDetails.issuer = m_securityDetails.issuer.isolatedCopy(); 231 data->m_securityDetails.issuer = m_securityDetails.issuer.isolatedCopy();
234 data->m_securityDetails.validFrom = m_securityDetails.validFrom; 232 data->m_securityDetails.validFrom = m_securityDetails.validFrom;
(...skipping 417 matching lines...) Expand 10 before | Expand all | Expand 10 after
652 if (a.resourceLoadTiming() != b.resourceLoadTiming()) 650 if (a.resourceLoadTiming() != b.resourceLoadTiming())
653 return false; 651 return false;
654 if (a.encodedBodyLength() != b.encodedBodyLength()) 652 if (a.encodedBodyLength() != b.encodedBodyLength())
655 return false; 653 return false;
656 if (a.decodedBodyLength() != b.decodedBodyLength()) 654 if (a.decodedBodyLength() != b.decodedBodyLength())
657 return false; 655 return false;
658 return true; 656 return true;
659 } 657 }
660 658
661 } // namespace blink 659 } // namespace blink
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/network/ResourceResponse.h ('k') | third_party/WebKit/Source/web/FrameLoaderClientImpl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698