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

Unified Diff: content/renderer/media/media_stream_constraints_util.cc

Issue 2790823002: Spec compliant video constraints for getUserMedia behind flag. (Closed)
Patch Set: rebase Created 3 years, 8 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
Index: content/renderer/media/media_stream_constraints_util.cc
diff --git a/content/renderer/media/media_stream_constraints_util.cc b/content/renderer/media/media_stream_constraints_util.cc
index 16b3fcd22b1194e487f92eb389e85a7665f74114..e2bb458feda89c4bef35c0c01a31a04ffd6fb487 100644
--- a/content/renderer/media/media_stream_constraints_util.cc
+++ b/content/renderer/media/media_stream_constraints_util.cc
@@ -21,7 +21,9 @@ template <typename P, typename T>
bool ScanConstraintsForExactValue(const blink::WebMediaConstraints& constraints,
P picker,
T* value) {
- DCHECK(!constraints.isNull());
+ if (constraints.isNull())
+ return false;
+
const auto& the_field = constraints.basic().*picker;
if (the_field.hasExact()) {
*value = the_field.exact();
@@ -41,7 +43,9 @@ template <typename P, typename T>
bool ScanConstraintsForMaxValue(const blink::WebMediaConstraints& constraints,
P picker,
T* value) {
- DCHECK(!constraints.isNull());
+ if (constraints.isNull())
+ return false;
+
const auto& the_field = constraints.basic().*picker;
if (the_field.hasMax()) {
*value = the_field.max();
@@ -69,7 +73,9 @@ template <typename P, typename T>
bool ScanConstraintsForMinValue(const blink::WebMediaConstraints& constraints,
P picker,
T* value) {
- DCHECK(!constraints.isNull());
+ if (constraints.isNull())
+ return false;
+
const auto& the_field = constraints.basic().*picker;
if (the_field.hasMin()) {
*value = the_field.min();
« no previous file with comments | « content/renderer/media/media_stream_center.cc ('k') | content/renderer/media/media_stream_video_capturer_source.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698