Image Capture: adding fillLightMode getting/setting

third_party/WebKit/Source/modules/imagecapture/ImageCapture.cpp

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "modules/imagecapture/ImageCapture.h"
 
 #include "bindings/core/v8/CallbackPromiseAdapter.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/ExceptionCode.h"
@@ skipping 25 matching lines @@
 }
 
 media::mojom::blink::MeteringMode parseMeteringMode(const String& blinkMode)
 {
     if (blinkMode == "manual")
         return media::mojom::blink::MeteringMode::MANUAL;
     if (blinkMode == "single-shot")
         return media::mojom::blink::MeteringMode::SINGLE_SHOT;
     if (blinkMode == "continuous")
         return media::mojom::blink::MeteringMode::CONTINUOUS;
-    return media::mojom::blink::MeteringMode::UNAVAILABLE;
+    return media::mojom::blink::MeteringMode::NONE;
+}
+
+media::mojom::blink::FillLightMode parseFillLightMode(const String& blinkMode)
+{
+    if (blinkMode == "off")
+        return media::mojom::blink::FillLightMode::OFF;
+    if (blinkMode == "auto")
+        return media::mojom::blink::FillLightMode::AUTO;
+    if (blinkMode == "flash")
+        return media::mojom::blink::FillLightMode::FLASH;
+    if (blinkMode == "torch")
+        return media::mojom::blink::FillLightMode::TORCH;
+    return media::mojom::blink::FillLightMode::NONE;
 }
 
 } // anonymous namespace
 
 ImageCapture* ImageCapture::create(ExecutionContext* context, MediaStreamTrack* track, ExceptionState& exceptionState)
 {
     if (track->kind() != "video") {
         exceptionState.throwDOMException(NotSupportedError, "Cannot create an ImageCapturer from a non-video Track.");
         return nullptr;
     }
@@ skipping 89 matching lines @@
         settings->exposure_compensation = photoSettings.exposureCompensation();
     settings->has_white_balance_mode = photoSettings.hasWhiteBalanceMode();
     if (settings->has_white_balance_mode)
         settings->white_balance_mode = parseMeteringMode(photoSettings.whiteBalanceMode());
     settings->has_iso = photoSettings.hasIso();
     if (settings->has_iso)
         settings->iso = photoSettings.iso();
     settings->has_red_eye_reduction = photoSettings.hasRedEyeReduction();
     if (settings->has_red_eye_reduction)
         settings->red_eye_reduction = photoSettings.redEyeReduction();
+    settings->has_fill_light_mode = photoSettings.hasExposureMode();
+    if (settings->has_fill_light_mode)
+        settings->fill_light_mode = parseFillLightMode(photoSettings.fillLightMode());
     if (photoSettings.hasPointsOfInterest()) {
         for (const auto& point : photoSettings.pointsOfInterest()) {
             auto mojoPoint = media::mojom::blink::Point2D::New();
             mojoPoint->x = point.x();
             mojoPoint->y = point.y();
             settings->points_of_interest.append(std::move(mojoPoint));
         }
     }
 
     m_service->SetOptions(m_streamTrack->component()->source()->id(), std::move(settings), convertToBaseCallback(WTF::bind(&ImageCapture::onSetOptions, wrapPersistent(this), wrapPersistent(resolver))));
@@ skipping 81 matching lines @@
         MediaSettingsRange* exposureCompensation = MediaSettingsRange::create(capabilities->exposure_compensation->max, capabilities->exposure_compensation->min, capabilities->exposure_compensation->current);
         PhotoCapabilities* caps = PhotoCapabilities::create();
         caps->setIso(iso);
         caps->setImageHeight(height);
         caps->setImageWidth(width);
         caps->setZoom(zoom);
         caps->setFocusMode(capabilities->focus_mode);
         caps->setExposureMode(capabilities->exposure_mode);
         caps->setExposureCompensation(exposureCompensation);
         caps->setWhiteBalanceMode(capabilities->white_balance_mode);
+        caps->setFillLightMode(capabilities->fill_light_mode);
         resolver->resolve(caps);
     }
     m_serviceRequests.remove(resolver);
 }
 
 void ImageCapture::onSetOptions(ScriptPromiseResolver* resolver, bool result)
 {
     if (!m_serviceRequests.contains(resolver))
         return;
 
@@ skipping 27 matching lines @@
 
 DEFINE_TRACE(ImageCapture)
 {
     visitor->trace(m_streamTrack);
     visitor->trace(m_serviceRequests);
     EventTargetWithInlineData::trace(visitor);
     ContextLifecycleObserver::trace(visitor);
 }
 
 } // namespace blink