Image Capture: two small nits

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 385 matching lines @@
 void ImageCapture::ClearMediaTrackConstraints(ScriptPromiseResolver* resolver) {
   current_constraints_ = MediaTrackConstraintSet();
   resolver->Resolve();
 
   // TODO(mcasas): Clear also any PhotoSettings that the device might have got
   // configured, for that we need to know a "default" state of the device; take
   // a snapshot upon first opening. https://crbug.com/700607.
 }
 
 void ImageCapture::GetMediaTrackSettings(MediaTrackSettings& settings) const {
-  // Merge any present |m_settings| members into |settings|.
+  // Merge any present |settings_| members into |settings|.
 
   if (settings_.hasWhiteBalanceMode())
     settings.setWhiteBalanceMode(settings_.whiteBalanceMode());
   if (settings_.hasExposureMode())
     settings.setExposureMode(settings_.exposureMode());
   if (settings_.hasFocusMode())
     settings.setFocusMode(settings_.focusMode());
 
-  if (settings_.hasPointsOfInterest())
+  if (settings_.hasPointsOfInterest() &&
+      !settings_.pointsOfInterest().IsEmpty()) {
     settings.setPointsOfInterest(settings_.pointsOfInterest());
+  }
 
   if (settings_.hasExposureCompensation())
     settings.setExposureCompensation(settings_.exposureCompensation());
   if (settings_.hasColorTemperature())
     settings.setColorTemperature(settings_.colorTemperature());
   if (settings_.hasIso())
     settings.setIso(settings_.iso());
 
   if (settings_.hasBrightness())
     settings.setBrightness(settings_.brightness());
@@ skipping 70 matching lines @@
     // mojo::StructTraits supports garbage-collected mappings,
     // https://crbug.com/700180.
     if (capabilities->height->min != 0 || capabilities->height->max != 0) {
       caps->SetImageHeight(
           MediaSettingsRange::Create(std::move(capabilities->height)));
     }
     if (capabilities->width->min != 0 || capabilities->width->max != 0) {
       caps->SetImageWidth(
           MediaSettingsRange::Create(std::move(capabilities->width)));
     }
-    caps->SetFillLightMode(capabilities->fill_light_mode);
+
+    if (!capabilities->fill_light_mode.IsEmpty())
+      caps->SetFillLightMode(capabilities->fill_light_mode);
 
     resolver->Resolve(caps);
   }
   service_requests_.erase(resolver);
 }
 
 void ImageCapture::OnSetOptions(ScriptPromiseResolver* resolver, bool result) {
   if (!service_requests_.Contains(resolver))
     return;
 
@@ skipping 139 matching lines @@
   visitor->Trace(stream_track_);
   visitor->Trace(capabilities_);
   visitor->Trace(settings_);
   visitor->Trace(current_constraints_);
   visitor->Trace(service_requests_);
   EventTargetWithInlineData::Trace(visitor);
   ContextLifecycleObserver::Trace(visitor);
 }
 
 }  // namespace blink