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

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

Issue 1497423002: Revert of Downgrade lock icon for broken-HTTPS subresources (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix conflict Created 5 years 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 30 matching lines...) Expand all
41 , m_connectionReused(false) 41 , m_connectionReused(false)
42 , m_isNull(true) 42 , m_isNull(true)
43 , m_haveParsedAgeHeader(false) 43 , m_haveParsedAgeHeader(false)
44 , m_haveParsedDateHeader(false) 44 , m_haveParsedDateHeader(false)
45 , m_haveParsedExpiresHeader(false) 45 , m_haveParsedExpiresHeader(false)
46 , m_haveParsedLastModifiedHeader(false) 46 , m_haveParsedLastModifiedHeader(false)
47 , m_age(0.0) 47 , m_age(0.0)
48 , m_date(0.0) 48 , m_date(0.0)
49 , m_expires(0.0) 49 , m_expires(0.0)
50 , m_lastModified(0.0) 50 , m_lastModified(0.0)
51 , m_hasMajorCertificateErrors(false)
52 , m_securityStyle(SecurityStyleUnknown) 51 , m_securityStyle(SecurityStyleUnknown)
53 , m_httpVersion(HTTPVersionUnknown) 52 , m_httpVersion(HTTPVersionUnknown)
54 , m_appCacheID(0) 53 , m_appCacheID(0)
55 , m_isMultipartPayload(false) 54 , m_isMultipartPayload(false)
56 , m_wasFetchedViaSPDY(false) 55 , m_wasFetchedViaSPDY(false)
57 , m_wasNpnNegotiated(false) 56 , m_wasNpnNegotiated(false)
58 , m_wasAlternateProtocolAvailable(false) 57 , m_wasAlternateProtocolAvailable(false)
59 , m_wasFetchedViaProxy(false) 58 , m_wasFetchedViaProxy(false)
60 , m_wasFetchedViaServiceWorker(false) 59 , m_wasFetchedViaServiceWorker(false)
61 , m_wasFallbackRequiredByServiceWorker(false) 60 , m_wasFallbackRequiredByServiceWorker(false)
(...skipping 16 matching lines...) Expand all
78 , m_connectionReused(false) 77 , m_connectionReused(false)
79 , m_isNull(false) 78 , m_isNull(false)
80 , m_haveParsedAgeHeader(false) 79 , m_haveParsedAgeHeader(false)
81 , m_haveParsedDateHeader(false) 80 , m_haveParsedDateHeader(false)
82 , m_haveParsedExpiresHeader(false) 81 , m_haveParsedExpiresHeader(false)
83 , m_haveParsedLastModifiedHeader(false) 82 , m_haveParsedLastModifiedHeader(false)
84 , m_age(0.0) 83 , m_age(0.0)
85 , m_date(0.0) 84 , m_date(0.0)
86 , m_expires(0.0) 85 , m_expires(0.0)
87 , m_lastModified(0.0) 86 , m_lastModified(0.0)
88 , m_hasMajorCertificateErrors(false)
89 , m_securityStyle(SecurityStyleUnknown) 87 , m_securityStyle(SecurityStyleUnknown)
90 , m_httpVersion(HTTPVersionUnknown) 88 , m_httpVersion(HTTPVersionUnknown)
91 , m_appCacheID(0) 89 , m_appCacheID(0)
92 , m_isMultipartPayload(false) 90 , m_isMultipartPayload(false)
93 , m_wasFetchedViaSPDY(false) 91 , m_wasFetchedViaSPDY(false)
94 , m_wasNpnNegotiated(false) 92 , m_wasNpnNegotiated(false)
95 , m_wasAlternateProtocolAvailable(false) 93 , m_wasAlternateProtocolAvailable(false)
96 , m_wasFetchedViaProxy(false) 94 , m_wasFetchedViaProxy(false)
97 , m_wasFetchedViaServiceWorker(false) 95 , m_wasFetchedViaServiceWorker(false)
98 , m_wasFallbackRequiredByServiceWorker(false) 96 , m_wasFallbackRequiredByServiceWorker(false)
(...skipping 12 matching lines...) Expand all
111 response->setTextEncodingName(AtomicString(data->m_textEncodingName)); 109 response->setTextEncodingName(AtomicString(data->m_textEncodingName));
112 response->setSuggestedFilename(data->m_suggestedFilename); 110 response->setSuggestedFilename(data->m_suggestedFilename);
113 111
114 response->setHTTPStatusCode(data->m_httpStatusCode); 112 response->setHTTPStatusCode(data->m_httpStatusCode);
115 response->setHTTPStatusText(AtomicString(data->m_httpStatusText)); 113 response->setHTTPStatusText(AtomicString(data->m_httpStatusText));
116 114
117 response->m_httpHeaderFields.adopt(data->m_httpHeaders.release()); 115 response->m_httpHeaderFields.adopt(data->m_httpHeaders.release());
118 response->setLastModifiedDate(data->m_lastModifiedDate); 116 response->setLastModifiedDate(data->m_lastModifiedDate);
119 response->setResourceLoadTiming(data->m_resourceLoadTiming.release()); 117 response->setResourceLoadTiming(data->m_resourceLoadTiming.release());
120 response->m_securityInfo = data->m_securityInfo; 118 response->m_securityInfo = data->m_securityInfo;
121 response->m_hasMajorCertificateErrors = data->m_hasMajorCertificateErrors;
122 response->m_securityStyle = data->m_securityStyle; 119 response->m_securityStyle = data->m_securityStyle;
123 response->m_securityDetails.protocol = data->m_securityDetails.protocol; 120 response->m_securityDetails.protocol = data->m_securityDetails.protocol;
124 response->m_securityDetails.cipher = data->m_securityDetails.cipher; 121 response->m_securityDetails.cipher = data->m_securityDetails.cipher;
125 response->m_securityDetails.keyExchange = data->m_securityDetails.keyExchang e; 122 response->m_securityDetails.keyExchange = data->m_securityDetails.keyExchang e;
126 response->m_securityDetails.mac = data->m_securityDetails.mac; 123 response->m_securityDetails.mac = data->m_securityDetails.mac;
127 response->m_securityDetails.certID = data->m_securityDetails.certID; 124 response->m_securityDetails.certID = data->m_securityDetails.certID;
128 response->m_httpVersion = data->m_httpVersion; 125 response->m_httpVersion = data->m_httpVersion;
129 response->m_appCacheID = data->m_appCacheID; 126 response->m_appCacheID = data->m_appCacheID;
130 response->m_appCacheManifestURL = data->m_appCacheManifestURL.copy(); 127 response->m_appCacheManifestURL = data->m_appCacheManifestURL.copy();
131 response->m_isMultipartPayload = data->m_isMultipartPayload; 128 response->m_isMultipartPayload = data->m_isMultipartPayload;
(...skipping 25 matching lines...) Expand all
157 data->m_expectedContentLength = expectedContentLength(); 154 data->m_expectedContentLength = expectedContentLength();
158 data->m_textEncodingName = textEncodingName().string().isolatedCopy(); 155 data->m_textEncodingName = textEncodingName().string().isolatedCopy();
159 data->m_suggestedFilename = suggestedFilename().isolatedCopy(); 156 data->m_suggestedFilename = suggestedFilename().isolatedCopy();
160 data->m_httpStatusCode = httpStatusCode(); 157 data->m_httpStatusCode = httpStatusCode();
161 data->m_httpStatusText = httpStatusText().string().isolatedCopy(); 158 data->m_httpStatusText = httpStatusText().string().isolatedCopy();
162 data->m_httpHeaders = httpHeaderFields().copyData(); 159 data->m_httpHeaders = httpHeaderFields().copyData();
163 data->m_lastModifiedDate = lastModifiedDate(); 160 data->m_lastModifiedDate = lastModifiedDate();
164 if (m_resourceLoadTiming) 161 if (m_resourceLoadTiming)
165 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy(); 162 data->m_resourceLoadTiming = m_resourceLoadTiming->deepCopy();
166 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length( )); 163 data->m_securityInfo = CString(m_securityInfo.data(), m_securityInfo.length( ));
167 data->m_hasMajorCertificateErrors = m_hasMajorCertificateErrors;
168 data->m_securityStyle = m_securityStyle; 164 data->m_securityStyle = m_securityStyle;
169 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy() ; 165 data->m_securityDetails.protocol = m_securityDetails.protocol.isolatedCopy() ;
170 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy(); 166 data->m_securityDetails.cipher = m_securityDetails.cipher.isolatedCopy();
171 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated Copy(); 167 data->m_securityDetails.keyExchange = m_securityDetails.keyExchange.isolated Copy();
172 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy(); 168 data->m_securityDetails.mac = m_securityDetails.mac.isolatedCopy();
173 data->m_securityDetails.certID = m_securityDetails.certID; 169 data->m_securityDetails.certID = m_securityDetails.certID;
174 data->m_httpVersion = m_httpVersion; 170 data->m_httpVersion = m_httpVersion;
175 data->m_appCacheID = m_appCacheID; 171 data->m_appCacheID = m_appCacheID;
176 data->m_appCacheManifestURL = m_appCacheManifestURL.copy(); 172 data->m_appCacheManifestURL = m_appCacheManifestURL.copy();
177 data->m_isMultipartPayload = m_isMultipartPayload; 173 data->m_isMultipartPayload = m_isMultipartPayload;
(...skipping 390 matching lines...) Expand 10 before | Expand all | Expand 10 after
568 if (a.httpHeaderFields() != b.httpHeaderFields()) 564 if (a.httpHeaderFields() != b.httpHeaderFields())
569 return false; 565 return false;
570 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming()) 566 if (a.resourceLoadTiming() && b.resourceLoadTiming() && *a.resourceLoadTimin g() == *b.resourceLoadTiming())
571 return true; 567 return true;
572 if (a.resourceLoadTiming() != b.resourceLoadTiming()) 568 if (a.resourceLoadTiming() != b.resourceLoadTiming())
573 return false; 569 return false;
574 return true; 570 return true;
575 } 571 }
576 572
577 } 573 }
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