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

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

Issue 2795923003: Image Capture: remove MediaSettingsRange.current (Closed)
Patch Set: bugfix: getMediaTrackSettings() should merge dictionaries, not override the input parameter; Layout… Created 3 years, 8 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 3630f00ee2663cbc56470e78a13de982a85a9c8b..6a59e2b1b10fcc872a455f7cee9eda3779f7845b 100644
--- a/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
+++ b/third_party/WebKit/Source/modules/imagecapture/ImageCapture.h
@@ -15,13 +15,13 @@
#include "modules/ModulesExport.h"
#include "modules/mediastream/MediaTrackCapabilities.h"
#include "modules/mediastream/MediaTrackConstraintSet.h"
+#include "modules/mediastream/MediaTrackSettings.h"
#include "platform/AsyncMethodRunner.h"
namespace blink {
class ExceptionState;
class MediaStreamTrack;
-class MediaTrackSettings;
class PhotoSettings;
class ScriptPromiseResolver;
class WebImageCaptureFrameGrabber;
@@ -87,10 +87,9 @@ class MODULES_EXPORT ImageCapture final
media::mojom::blink::ImageCapturePtr m_service;
MediaTrackCapabilities m_capabilities;
+ MediaTrackSettings m_settings;
MediaTrackConstraintSet m_currentConstraints;
- HeapVector<Point2D> m_currentPointsOfInterest;
-
HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;
};

Powered by Google App Engine
This is Rietveld 408576698