Image Capture: make sure applyConstraints() only works for ImageCapture constraints

third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  * Copyright (C) 2011 Ericsson AB. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 287 matching lines @@
   if (m_imageCapture)
     m_imageCapture->getMediaTrackSettings(settings);
 }
 
 ScriptPromise MediaStreamTrack::applyConstraints(
     ScriptState* scriptState,
     const MediaTrackConstraints& constraints) {
   ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
   ScriptPromise promise = resolver->promise();
 
-  // |constraints| is an optional argument, which is strange.
-  // TODO(mcasas): remove this provision if |constraints| is not optional:
-  // https://github.com/w3c/mediacapture-main/issues/438
-  if (!constraints.hasAdvanced()) {
-    resolver->resolve();
+  // TODO(mcasas): Until https://crbug.com/338503 is landed, we only support
+  // ImageCapture-related constraints.
+  if (!m_imageCapture ||
+      m_imageCapture->hasNonImageCaptureConstraints(constraints)) {
+    resolver->reject(DOMException::create(
+        NotSupportedError,
+        "Only Image-Capture constraints supported (https://crbug.com/338503)"));
     return promise;
   }
 
-  if (!m_imageCapture) {
-    resolver->reject(DOMException::create(
-        NotSupportedError, "Track type not currently supported"));
-    return promise;
-  }
+  // |constraints| empty means "remove/clear all current constraints".
+  if (!constraints.hasAdvanced())
+    m_imageCapture->clearMediaTrackConstraints(resolver);
+  else
+    m_imageCapture->setMediaTrackConstraints(resolver, constraints.advanced());
 
-  // TODO(mcasas): support more advanced constraints, https://crbug.com/700607.
-  m_imageCapture->setMediaTrackConstraints(resolver, constraints.advanced()[0]);
   return promise;
 }
 
 bool MediaStreamTrack::ended() const {
   return m_stopped || (m_readyState == MediaStreamSource::ReadyStateEnded);
 }
 
 void MediaStreamTrack::sourceChangedState() {
   if (ended())
     return;
@@ skipping 74 matching lines @@
 
 DEFINE_TRACE(MediaStreamTrack) {
   visitor->trace(m_registeredMediaStreams);
   visitor->trace(m_component);
   visitor->trace(m_imageCapture);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink