Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2015 Google Inc. All rights reserved. | 2 * Copyright (C) 2015 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 | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * | 7 * |
| 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 12 matching lines...) Expand all Loading... | |
| 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | 23 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT |
| 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | 24 * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, |
| 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | 25 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY |
| 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 26 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 27 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 28 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 29 */ | 29 */ |
| 30 | 30 |
| 31 #include "modules/peerconnection/RTCCertificate.h" | 31 #include "modules/peerconnection/RTCCertificate.h" |
| 32 | 32 |
| 33 #include "bindings/core/v8/ScriptState.h" | |
| 34 #include "bindings/core/v8/ToV8.h" | |
| 33 #include "platform/wtf/PtrUtil.h" | 35 #include "platform/wtf/PtrUtil.h" |
| 34 | 36 |
| 35 namespace blink { | 37 namespace blink { |
| 36 | 38 |
| 37 RTCCertificate::RTCCertificate(std::unique_ptr<WebRTCCertificate> certificate) | 39 RTCCertificate::RTCCertificate(std::unique_ptr<WebRTCCertificate> certificate) |
| 38 : certificate_(WTF::WrapUnique(certificate.release())) {} | 40 : certificate_(WTF::WrapUnique(certificate.release())) {} |
| 39 | 41 |
| 40 std::unique_ptr<WebRTCCertificate> RTCCertificate::CertificateShallowCopy() | 42 std::unique_ptr<WebRTCCertificate> RTCCertificate::CertificateShallowCopy() |
| 41 const { | 43 const { |
| 42 return certificate_->ShallowCopy(); | 44 return certificate_->ShallowCopy(); |
| 43 } | 45 } |
| 44 | 46 |
| 45 DOMTimeStamp RTCCertificate::expires() const { | 47 DOMTimeStamp RTCCertificate::expires() const { |
| 46 return static_cast<DOMTimeStamp>(certificate_->Expires()); | 48 return static_cast<DOMTimeStamp>(certificate_->Expires()); |
| 47 } | 49 } |
| 48 | 50 |
| 51 Vector<v8::Local<v8::Value>> RTCCertificate::fingerprints( | |
| 52 ScriptState* script_state) { | |
| 53 v8::Isolate* isolate = script_state->GetIsolate(); | |
| 54 if (!fingerprints_.size()) { | |
|
Guido Urdaneta
2017/04/19 12:20:42
use IsEmpty() instead of !size
hbos_chromium
2017/04/20 09:07:09
Done.
| |
| 55 v8::Local<v8::Object> creation_context = | |
| 56 script_state->GetContext()->Global(); | |
| 57 for (const WebRTCDtlsFingerprint& web_fingerprint : | |
| 58 certificate_->Fingerprints()) { | |
| 59 RTCDtlsFingerprint fingerprint; | |
| 60 fingerprint.setAlgorithm(web_fingerprint.Algorithm()); | |
| 61 fingerprint.setValue(web_fingerprint.Value()); | |
| 62 fingerprints_.push_back(v8::Global<v8::Value>( | |
|
Guido Urdaneta
2017/04/19 12:20:42
I've seen that other cases that return a FrozenArr
hbos_chromium
2017/04/20 09:07:09
Yes, good catch. Without it the array is frozen bu
| |
| 63 isolate, ToV8(fingerprint, creation_context, isolate))); | |
| 64 } | |
| 65 } | |
| 66 Vector<v8::Local<v8::Value>> fingerprints(fingerprints_.size()); | |
| 67 for (size_t i = 0; i < fingerprints_.size(); ++i) { | |
| 68 fingerprints[i] = v8::Local<v8::Value>::New(isolate, fingerprints_[i]); | |
| 69 } | |
| 70 return fingerprints; | |
| 71 } | |
| 72 | |
| 49 } // namespace blink | 73 } // namespace blink |
| OLD | NEW |