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

Side by Side Diff: third_party/WebKit/Source/modules/imagecapture/ImageCapture.h

Issue 2265873003: binding: Moves hasPendingActivity from ActiveScriptWrappable to ScriptWrappable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Addressed review comments. Created 4 years, 4 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 "bindings/core/v8/ActiveScriptWrappable.h" 8 #include "bindings/core/v8/ActiveScriptWrappable.h"
9 #include "bindings/core/v8/ScriptPromise.h" 9 #include "bindings/core/v8/ScriptPromise.h"
10 #include "core/dom/ContextLifecycleObserver.h" 10 #include "core/dom/ContextLifecycleObserver.h"
(...skipping 20 matching lines...) Expand all
31 USING_GARBAGE_COLLECTED_MIXIN(ImageCapture); 31 USING_GARBAGE_COLLECTED_MIXIN(ImageCapture);
32 DEFINE_WRAPPERTYPEINFO(); 32 DEFINE_WRAPPERTYPEINFO();
33 public: 33 public:
34 static ImageCapture* create(ExecutionContext*, MediaStreamTrack*, ExceptionS tate&); 34 static ImageCapture* create(ExecutionContext*, MediaStreamTrack*, ExceptionS tate&);
35 ~ImageCapture() override; 35 ~ImageCapture() override;
36 36
37 // EventTarget implementation. 37 // EventTarget implementation.
38 const AtomicString& interfaceName() const override; 38 const AtomicString& interfaceName() const override;
39 ExecutionContext* getExecutionContext() const override; 39 ExecutionContext* getExecutionContext() const override;
40 40
41 // ActiveScriptWrappable implementation. 41 // ScriptWrappable implementation.
42 bool hasPendingActivity() const final; 42 bool hasPendingActivity() const final;
43 43
44 // ContextLifecycleObserver 44 // ContextLifecycleObserver
45 void contextDestroyed() override; 45 void contextDestroyed() override;
46 46
47 MediaStreamTrack* videoStreamTrack() const { return m_streamTrack.get(); } 47 MediaStreamTrack* videoStreamTrack() const { return m_streamTrack.get(); }
48 48
49 ScriptPromise getPhotoCapabilities(ScriptState*, ExceptionState&); 49 ScriptPromise getPhotoCapabilities(ScriptState*, ExceptionState&);
50 50
51 ScriptPromise setOptions(ScriptState*, const PhotoSettings&, ExceptionState& ); 51 ScriptPromise setOptions(ScriptState*, const PhotoSettings&, ExceptionState& );
(...skipping 15 matching lines...) Expand all
67 Member<MediaStreamTrack> m_streamTrack; 67 Member<MediaStreamTrack> m_streamTrack;
68 std::unique_ptr<WebImageCaptureFrameGrabber> m_frameGrabber; 68 std::unique_ptr<WebImageCaptureFrameGrabber> m_frameGrabber;
69 media::mojom::blink::ImageCapturePtr m_service; 69 media::mojom::blink::ImageCapturePtr m_service;
70 70
71 HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests; 71 HeapHashSet<Member<ScriptPromiseResolver>> m_serviceRequests;
72 }; 72 };
73 73
74 } // namespace blink 74 } // namespace blink
75 75
76 #endif // ImageCapture_h 76 #endif // ImageCapture_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698