Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(726)

Unified Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.h

Issue 2747573002: Image Capture: MediaStreamTrack::getCapabilities() (Closed)
Patch Set: haraken@ and reillyg@s comments Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 45d24862c007c330c86cc74831f3fd4b89c3d2fa..84de0da74d2ccb1f14517849bd399a566f65a579 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
@@ -5,6 +5,7 @@
#ifndef ImageCapture_h
#define ImageCapture_h
+#include <memory>
#include "bindings/core/v8/ActiveScriptWrappable.h"
#include "bindings/core/v8/ScriptPromise.h"
#include "core/dom/ContextLifecycleObserver.h"
@@ -12,8 +13,8 @@
#include "media/capture/mojo/image_capture.mojom-blink.h"
#include "modules/EventTargetModules.h"
#include "modules/ModulesExport.h"
+#include "modules/mediastream/MediaTrackCapabilities.h"
#include "platform/AsyncMethodRunner.h"
-#include <memory>
namespace blink {
@@ -58,6 +59,8 @@ class MODULES_EXPORT ImageCapture final
ScriptPromise grabFrame(ScriptState*, ExceptionState&);
+ MediaTrackCapabilities& getMediaTrackCapabilities();
+
DECLARE_VIRTUAL_TRACE();
private:
@@ -67,11 +70,13 @@ 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 onServiceConnectionError();
Member<MediaStreamTrack> m_streamTrack;
std::unique_ptr<WebImageCaptureFrameGrabber> m_frameGrabber;
media::mojom::blink::ImageCapturePtr m_service;
+ MediaTrackCapabilities m_capabilities;
HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;
};

Powered by Google App Engine
This is Rietveld 408576698