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

Side by Side 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 unified diff | Download patch
OLDNEW
1 // Copyright 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef ImageCapture_h 5 #ifndef ImageCapture_h
6 #define ImageCapture_h 6 #define ImageCapture_h
7 7
8 #include <memory> 8 #include <memory>
9 #include "bindings/core/v8/ActiveScriptWrappable.h" 9 #include "bindings/core/v8/ActiveScriptWrappable.h"
10 #include "bindings/core/v8/ScriptPromise.h" 10 #include "bindings/core/v8/ScriptPromise.h"
11 #include "core/dom/ContextLifecycleObserver.h" 11 #include "core/dom/ContextLifecycleObserver.h"
12 #include "core/events/EventTarget.h" 12 #include "core/events/EventTarget.h"
13 #include "media/capture/mojo/image_capture.mojom-blink.h" 13 #include "media/capture/mojo/image_capture.mojom-blink.h"
14 #include "modules/EventTargetModules.h" 14 #include "modules/EventTargetModules.h"
15 #include "modules/ModulesExport.h" 15 #include "modules/ModulesExport.h"
16 #include "modules/mediastream/MediaTrackCapabilities.h" 16 #include "modules/mediastream/MediaTrackCapabilities.h"
17 #include "modules/mediastream/MediaTrackConstraintSet.h" 17 #include "modules/mediastream/MediaTrackConstraintSet.h"
18 #include "modules/mediastream/MediaTrackSettings.h"
18 #include "platform/AsyncMethodRunner.h" 19 #include "platform/AsyncMethodRunner.h"
19 20
20 namespace blink { 21 namespace blink {
21 22
22 class ExceptionState; 23 class ExceptionState;
23 class MediaStreamTrack; 24 class MediaStreamTrack;
24 class MediaTrackSettings;
25 class PhotoSettings; 25 class PhotoSettings;
26 class ScriptPromiseResolver; 26 class ScriptPromiseResolver;
27 class WebImageCaptureFrameGrabber; 27 class WebImageCaptureFrameGrabber;
28 28
29 // TODO(mcasas): Consideradding a LayoutTest checking that this class is not 29 // TODO(mcasas): Consideradding a LayoutTest checking that this class is not
30 // garbage collected while it has event listeners. 30 // garbage collected while it has event listeners.
31 class MODULES_EXPORT ImageCapture final 31 class MODULES_EXPORT ImageCapture final
32 : public EventTargetWithInlineData, 32 : public EventTargetWithInlineData,
33 public ActiveScriptWrappable<ImageCapture>, 33 public ActiveScriptWrappable<ImageCapture>,
34 public ContextLifecycleObserver { 34 public ContextLifecycleObserver {
(...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
80 80
81 void onCapabilitiesUpdateInternal( 81 void onCapabilitiesUpdateInternal(
82 const media::mojom::blink::PhotoCapabilities&); 82 const media::mojom::blink::PhotoCapabilities&);
83 void onServiceConnectionError(); 83 void onServiceConnectionError();
84 84
85 Member<MediaStreamTrack> m_streamTrack; 85 Member<MediaStreamTrack> m_streamTrack;
86 std::unique_ptr<WebImageCaptureFrameGrabber> m_frameGrabber; 86 std::unique_ptr<WebImageCaptureFrameGrabber> m_frameGrabber;
87 media::mojom::blink::ImageCapturePtr m_service; 87 media::mojom::blink::ImageCapturePtr m_service;
88 88
89 MediaTrackCapabilities m_capabilities; 89 MediaTrackCapabilities m_capabilities;
90 MediaTrackSettings m_settings;
90 MediaTrackConstraintSet m_currentConstraints; 91 MediaTrackConstraintSet m_currentConstraints;
91 92
92 HeapVector<Point2D> m_currentPointsOfInterest;
93
94 HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests; 93 HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;
95 }; 94 };
96 95
97 } // namespace blink 96 } // namespace blink
98 97
99 #endif // ImageCapture_h 98 #endif // ImageCapture_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698