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

Unified Diff: content/renderer/media/webrtc/rtc_stats.cc

Issue 2340603004: Removed webrtc::RTCStatsMemberInterface::k[Sequence]StaticString usages. (Closed)
Patch Set: 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/renderer/media/webrtc/rtc_stats.cc
diff --git a/content/renderer/media/webrtc/rtc_stats.cc b/content/renderer/media/webrtc/rtc_stats.cc
index f8356379d6ab85c59ac9e3fc6d13c76c72fd539f..49490f89382fea19ffc478af6820a2ec4950f71a 100644
--- a/content/renderer/media/webrtc/rtc_stats.cc
+++ b/content/renderer/media/webrtc/rtc_stats.cc
@@ -95,7 +95,6 @@ blink::WebRTCStatsMemberType RTCStatsMember::type() const {
return blink::WebRTCStatsMemberTypeUint64;
case webrtc::RTCStatsMemberInterface::kDouble:
return blink::WebRTCStatsMemberTypeDouble;
- case webrtc::RTCStatsMemberInterface::kStaticString:
case webrtc::RTCStatsMemberInterface::kString:
return blink::WebRTCStatsMemberTypeString;
case webrtc::RTCStatsMemberInterface::kSequenceInt32:
@@ -108,7 +107,6 @@ blink::WebRTCStatsMemberType RTCStatsMember::type() const {
return blink::WebRTCStatsMemberTypeSequenceUint64;
case webrtc::RTCStatsMemberInterface::kSequenceDouble:
return blink::WebRTCStatsMemberTypeSequenceDouble;
- case webrtc::RTCStatsMemberInterface::kSequenceStaticString:
case webrtc::RTCStatsMemberInterface::kSequenceString:
return blink::WebRTCStatsMemberTypeSequenceString;
default:
@@ -138,17 +136,8 @@ double RTCStatsMember::valueDouble() const {
}
blink::WebString RTCStatsMember::valueString() const {
- switch (member_->type()) {
- case webrtc::RTCStatsMemberInterface::kStaticString:
- return blink::WebString::fromUTF8(
- *member_->cast_to<webrtc::RTCStatsMember<const char*>>());
- case webrtc::RTCStatsMemberInterface::kString:
- return blink::WebString::fromUTF8(
- *member_->cast_to<webrtc::RTCStatsMember<std::string>>());
- default:
- NOTREACHED();
- return blink::WebString();
- }
+ return blink::WebString::fromUTF8(
+ *member_->cast_to<webrtc::RTCStatsMember<std::string>>());
}
blink::WebVector<int32_t> RTCStatsMember::valueSequenceInt32() const {
@@ -177,31 +166,12 @@ blink::WebVector<double> RTCStatsMember::valueSequenceDouble() const {
}
blink::WebVector<blink::WebString> RTCStatsMember::valueSequenceString() const {
- switch (member_->type()) {
- case webrtc::RTCStatsMemberInterface::kStaticString:
- {
- const std::vector<const char*>& sequence =
- *member_->cast_to<
- webrtc::RTCStatsMember<std::vector<const char*>>>();
- blink::WebVector<blink::WebString> web_sequence(sequence.size());
- for (size_t i = 0; i < sequence.size(); ++i)
- web_sequence[i] = blink::WebString::fromUTF8(sequence[i]);
- return web_sequence;
- }
- case webrtc::RTCStatsMemberInterface::kString:
- {
- const std::vector<std::string>& sequence =
- *member_->cast_to<
- webrtc::RTCStatsMember<std::vector<std::string>>>();
- blink::WebVector<blink::WebString> web_sequence(sequence.size());
- for (size_t i = 0; i < sequence.size(); ++i)
- web_sequence[i] = blink::WebString::fromUTF8(sequence[i]);
- return web_sequence;
- }
- default:
- NOTREACHED();
- return blink::WebVector<blink::WebString>();
- }
+ const std::vector<std::string>& sequence =
+ *member_->cast_to<webrtc::RTCStatsMember<std::vector<std::string>>>();
+ blink::WebVector<blink::WebString> web_sequence(sequence.size());
+ for (size_t i = 0; i < sequence.size(); ++i)
+ web_sequence[i] = blink::WebString::fromUTF8(sequence[i]);
+ return web_sequence;
}
} // namespace content
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698