Image Capture: update PhotoCapabilities.idl to latest Spec changes

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"
 #include "core/fileapi/Blob.h"
 #include "core/frame/ImageBitmap.h"
 #include "modules/EventTargetModules.h"
 #include "modules/imagecapture/MediaSettingsRange.h"
 #include "modules/imagecapture/PhotoCapabilities.h"
 #include "modules/imagecapture/PhotoSettings.h"
 #include "modules/mediastream/MediaStreamTrack.h"
 #include "modules/mediastream/MediaTrackCapabilities.h"
 #include "modules/mediastream/MediaTrackSettings.h"
 #include "platform/WaitableEvent.h"
 #include "platform/mojo/MojoHelper.h"
 #include "public/platform/InterfaceProvider.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebImageCaptureFrameGrabber.h"
 #include "public/platform/WebMediaStreamTrack.h"
 #include "wtf/PtrUtil.h"
 
 namespace blink {
 
+using FillLightMode = media::mojom::blink::FillLightMode;
+
 namespace {
 
 const char kNoServiceError[] = "ImageCapture service unavailable.";
 
 bool trackIsInactive(const MediaStreamTrack& track) {
   // Spec instructs to return an exception if the Track's readyState() is not
   // "live". Also reject if the track is disabled or muted.
   return track.readyState() != "live" || !track.enabled() || track.muted();
 }
 
 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::NONE;
 }
 
-media::mojom::blink::FillLightMode parseFillLightMode(const String& blinkMode) {
+FillLightMode parseFillLightMode(const String& blinkMode) {
   if (blinkMode == "off")
-    return media::mojom::blink::FillLightMode::OFF;
+    return FillLightMode::OFF;
   if (blinkMode == "auto")
-    return media::mojom::blink::FillLightMode::AUTO;
+    return 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;
+    return FillLightMode::FLASH;
+  return FillLightMode::NONE;
 }
 
 WebString toString(media::mojom::blink::MeteringMode value) {
   switch (value) {
     case media::mojom::blink::MeteringMode::NONE:
       return WebString::fromUTF8("none");
     case media::mojom::blink::MeteringMode::MANUAL:
       return WebString::fromUTF8("manual");
     case media::mojom::blink::MeteringMode::SINGLE_SHOT:
       return WebString::fromUTF8("single-shot");
@@ skipping 353 matching lines @@
     onCapabilitiesUpdate(capabilities.Clone());
 
     PhotoCapabilities* caps = PhotoCapabilities::create();
     // TODO(mcasas): Remove the explicit MediaSettingsRange::create() when
     // mojo::StructTraits supports garbage-collected mappings,
     // https://crbug.com/700180.
     caps->setImageHeight(
         MediaSettingsRange::create(std::move(capabilities->height)));
     caps->setImageWidth(
         MediaSettingsRange::create(std::move(capabilities->width)));
-    caps->setFillLightMode(capabilities->fill_light_mode);
+
+    // TODO(mcasas): use a list of supported modes when mojo is updated.
+    // https://crbug.com/700607.
+    if (capabilities->fill_light_mode == FillLightMode::NONE)
+      caps->setFillLightMode(Vector<FillLightMode>());
+    else
+      caps->setFillLightMode({capabilities->fill_light_mode});
+
+    // TODO(mcasas): use a list of supported modes when mojo is updated.
+    // https://crbug.com/700607.
     caps->setRedEyeReduction(capabilities->red_eye_reduction);
 
     resolver->resolve(caps);
   }
   m_serviceRequests.erase(resolver);
 }
 
 void ImageCapture::onSetOptions(ScriptPromiseResolver* resolver, bool result) {
   if (!m_serviceRequests.contains(resolver))
     return;
@@ skipping 94 matching lines @@
 DEFINE_TRACE(ImageCapture) {
   visitor->trace(m_streamTrack);
   visitor->trace(m_capabilities);
   visitor->trace(m_currentConstraints);
   visitor->trace(m_serviceRequests);
   EventTargetWithInlineData::trace(visitor);
   ContextLifecycleObserver::trace(visitor);
 }
 
 }  // namespace blink