Image Capture: cache constraints and append them to MediaStreamTrack.getConstraints()

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

Index: third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
diff --git a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
index a93e097575f7b153eadf2a430bede2cdb5fa05ec..80a4e474c7e04107a74b2afc718d5dcc641cd1a0 100644
--- a/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
+++ b/third_party/WebKit/Source/modules/mediastream/MediaStreamTrack.cpp
@@ -216,10 +216,6 @@ MediaStreamTrack* MediaStreamTrack::clone(ScriptState* scriptState) {
   return clonedTrack;
 }
 
-void MediaStreamTrack::getConstraints(MediaTrackConstraints& constraints) {
-  MediaConstraintsImpl::convertConstraints(m_constraints, constraints);
-}
-
 void MediaStreamTrack::setConstraints(const WebMediaConstraints& constraints) {
   m_constraints = constraints;
 }
@@ -229,18 +225,41 @@ void MediaStreamTrack::getCapabilities(MediaTrackCapabilities& capabilities) {
     capabilities = m_imageCapture->getMediaTrackCapabilities();
 }
 
+void MediaStreamTrack::getConstraints(MediaTrackConstraints& constraints) {
+  MediaConstraintsImpl::convertConstraints(m_constraints, constraints);
+
+  if (!m_imageCapture)
+    return;
+  // Add the image capture constraints as another entry to the advanced().

[Reilly Grant (use Gerrit), 2017/03/18 01:17:13]

*to advanced

[mcasas, 2017/03/18 01:26:00]

Done.

+  HeapVector<MediaTrackConstraintSet> vector;
+  if (constraints.hasAdvanced())
+    vector = constraints.advanced();
+  auto imageCaptureConstraints = m_imageCapture->getMediaTrackConstraints();
+  // TODO(mcasas): add |torch|, https://crbug.com/700607.
+  if (imageCaptureConstraints.hasWhiteBalanceMode() ||
+      imageCaptureConstraints.hasExposureMode() ||
+      imageCaptureConstraints.hasFocusMode() ||
+      imageCaptureConstraints.hasExposureCompensation() ||
+      imageCaptureConstraints.hasColorTemperature() ||
+      imageCaptureConstraints.hasIso() ||
+      imageCaptureConstraints.hasBrightness() ||
+      imageCaptureConstraints.hasContrast() ||
+      imageCaptureConstraints.hasSaturation() ||
+      imageCaptureConstraints.hasSharpness() ||
+      imageCaptureConstraints.hasZoom()) {
+  }
+  constraints.setAdvanced(vector);

[Reilly Grant (use Gerrit), 2017/03/18 01:17:13]

This line should perhaps be in the body of the if above?

[mcasas, 2017/03/18 01:26:00]

Ouch yeah - sorry, I must have lost in a rebase.
Probably this'll make the LayoutTests fail too.

+}
+
 void MediaStreamTrack::getSettings(MediaTrackSettings& settings) {
   WebMediaStreamTrack::Settings platformSettings;
   m_component->getSettings(platformSettings);
-  if (platformSettings.hasFrameRate()) {
+  if (platformSettings.hasFrameRate())
     settings.setFrameRate(platformSettings.frameRate);
-  }
-  if (platformSettings.hasWidth()) {
+  if (platformSettings.hasWidth())
     settings.setWidth(platformSettings.width);
-  }
-  if (platformSettings.hasHeight()) {
+  if (platformSettings.hasHeight())
     settings.setHeight(platformSettings.height);
-  }
   if (RuntimeEnabledFeatures::mediaCaptureDepthEnabled() &&
       m_component->source()->type() == MediaStreamSource::TypeVideo) {
     if (platformSettings.hasVideoKind())