| 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 5c6b4e7909d4e085ea56df23adc9b8b91f4c7d4f..019d56b462a6e3dd45a706473a3e18693fd143d4 100644
|
| --- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
|
| +++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
|
| @@ -21,6 +21,7 @@ namespace blink {
|
|
|
| class ExceptionState;
|
| class MediaStreamTrack;
|
| +class MediaTrackSettings;
|
| class PhotoSettings;
|
| class ScriptPromiseResolver;
|
| class WebImageCaptureFrameGrabber;
|
| @@ -61,10 +62,10 @@ class MODULES_EXPORT ImageCapture final
|
| ScriptPromise grabFrame(ScriptState*);
|
|
|
| MediaTrackCapabilities& getMediaTrackCapabilities();
|
| -
|
| void setMediaTrackConstraints(ScriptPromiseResolver*,
|
| const MediaTrackConstraintSet&);
|
| const MediaTrackConstraintSet& getMediaTrackConstraints() const;
|
| + void getMediaTrackSettings(MediaTrackSettings&) const;
|
|
|
| DECLARE_VIRTUAL_TRACE();
|
|
|
| @@ -75,14 +76,14 @@ class MODULES_EXPORT ImageCapture final
|
| media::mojom::blink::PhotoCapabilitiesPtr);
|
| void onSetOptions(ScriptPromiseResolver*, bool);
|
| void onTakePhoto(ScriptPromiseResolver*, media::mojom::blink::BlobPtr);
|
| - void onCapabilitiesBootstrap(media::mojom::blink::PhotoCapabilitiesPtr);
|
| + void onCapabilitiesUpdate(media::mojom::blink::PhotoCapabilitiesPtr);
|
| void onServiceConnectionError();
|
|
|
| Member<MediaStreamTrack> m_streamTrack;
|
| std::unique_ptr<WebImageCaptureFrameGrabber> m_frameGrabber;
|
| media::mojom::blink::ImageCapturePtr m_service;
|
| - MediaTrackCapabilities m_capabilities;
|
|
|
| + MediaTrackCapabilities m_capabilities;
|
| MediaTrackConstraintSet m_currentConstraints;
|
|
|
| HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;
|
|
|