Image Capture: teach takePhoto() to accept an optional PhotoSettings dictionary

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

Index: third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
diff --git a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
index ff815ee663c0da68361a6098232aac5664578eb5..c75e0492f10451b4b8ecd7e3bc403d8f5776f005 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
@@ -56,9 +56,10 @@ class MODULES_EXPORT ImageCapture final
 
   ScriptPromise getPhotoCapabilities(ScriptState*);
 
-  ScriptPromise setOptions(ScriptState*, const PhotoSettings&);
+  ScriptPromise setOptions(ScriptState*, const PhotoSettings&, bool = false);

[Reilly Grant (use Gerrit), 2017/05/05 16:00:28]

Since the type name "bool" does not describe the argument please add the
variable name here.

[mcasas, 2017/05/05 16:38:07]

Done.

 
   ScriptPromise takePhoto(ScriptState*);
+  ScriptPromise takePhoto(ScriptState*, const PhotoSettings&);
 
   ScriptPromise grabFrame(ScriptState*);
 
@@ -77,14 +78,13 @@ class MODULES_EXPORT ImageCapture final
  private:
   ImageCapture(ExecutionContext*, MediaStreamTrack*);
 
-  void OnPhotoCapabilities(ScriptPromiseResolver*,
-                           media::mojom::blink::PhotoCapabilitiesPtr);
-  void OnSetOptions(ScriptPromiseResolver*, bool);
-  void OnTakePhoto(ScriptPromiseResolver*, media::mojom::blink::BlobPtr);
-  void OnCapabilitiesUpdate(media::mojom::blink::PhotoCapabilitiesPtr);
+  void OnMojoPhotoCapabilities(ScriptPromiseResolver*,
+                               bool,
+                               media::mojom::blink::PhotoCapabilitiesPtr);
+  void OnMojoSetOptions(ScriptPromiseResolver*, bool, bool);

[Reilly Grant (use Gerrit), 2017/05/05 16:00:28]

Please add variable names for these bools as well.

[mcasas, 2017/05/05 16:38:07]

Done.

+  void OnMojoTakePhoto(ScriptPromiseResolver*, media::mojom::blink::BlobPtr);
 
-  void OnCapabilitiesUpdateInternal(
-      const media::mojom::blink::PhotoCapabilities&);
+  void UpdateMediaTrackCapabilities(media::mojom::blink::PhotoCapabilitiesPtr);
   void OnServiceConnectionError();
 
   Member<MediaStreamTrack> stream_track_;