OLD | NEW |
1 /* | 1 /* |
2 * Copyright (C) 2009 Google Inc. All rights reserved. | 2 * Copyright (C) 2009 Google Inc. All rights reserved. |
3 * | 3 * |
4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
6 * met: | 6 * met: |
7 * | 7 * |
8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
331 } | 331 } |
332 | 332 |
333 void WebURLResponse::setSecurityDetails(const WebSecurityDetails& webSecurityDet
ails) | 333 void WebURLResponse::setSecurityDetails(const WebSecurityDetails& webSecurityDet
ails) |
334 { | 334 { |
335 blink::ResourceResponse::SignedCertificateTimestampList sctList; | 335 blink::ResourceResponse::SignedCertificateTimestampList sctList; |
336 for (const auto& iter : webSecurityDetails.sctList) | 336 for (const auto& iter : webSecurityDetails.sctList) |
337 sctList.append(static_cast<blink::ResourceResponse::SignedCertificateTim
estamp>(iter)); | 337 sctList.append(static_cast<blink::ResourceResponse::SignedCertificateTim
estamp>(iter)); |
338 m_resourceResponse->setSecurityDetails( | 338 m_resourceResponse->setSecurityDetails( |
339 webSecurityDetails.protocol, | 339 webSecurityDetails.protocol, |
340 webSecurityDetails.keyExchange, | 340 webSecurityDetails.keyExchange, |
| 341 webSecurityDetails.keyExchangeGroup, |
341 webSecurityDetails.cipher, | 342 webSecurityDetails.cipher, |
342 webSecurityDetails.mac, | 343 webSecurityDetails.mac, |
343 webSecurityDetails.certId, | 344 webSecurityDetails.certId, |
344 sctList); | 345 sctList); |
345 } | 346 } |
346 | 347 |
347 ResourceResponse& WebURLResponse::toMutableResourceResponse() | 348 ResourceResponse& WebURLResponse::toMutableResourceResponse() |
348 { | 349 { |
349 return *m_resourceResponse; | 350 return *m_resourceResponse; |
350 } | 351 } |
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
538 { | 539 { |
539 m_resourceResponse->setExtraData(ExtraDataContainer::create(extraData)); | 540 m_resourceResponse->setExtraData(ExtraDataContainer::create(extraData)); |
540 } | 541 } |
541 | 542 |
542 WebURLResponse::WebURLResponse(ResourceResponse& r) | 543 WebURLResponse::WebURLResponse(ResourceResponse& r) |
543 : m_resourceResponse(&r) | 544 : m_resourceResponse(&r) |
544 { | 545 { |
545 } | 546 } |
546 | 547 |
547 } // namespace blink | 548 } // namespace blink |
OLD | NEW |