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

Side by Side Diff: third_party/WebKit/Source/modules/mediarecorder/MediaRecorder.h

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 MediaRecorder_h 5 #ifndef MediaRecorder_h
6 #define MediaRecorder_h 6 #define MediaRecorder_h
7 7
8 #include "bindings/core/v8/ActiveScriptWrappable.h" 8 #include "bindings/core/v8/ActiveScriptWrappable.h"
9 #include "core/dom/ActiveDOMObject.h" 9 #include "core/dom/ActiveDOMObject.h"
10 #include "core/events/EventTarget.h" 10 #include "core/events/EventTarget.h"
11 #include "modules/EventTargetModules.h" 11 #include "modules/EventTargetModules.h"
12 #include "modules/ModulesExport.h" 12 #include "modules/ModulesExport.h"
13 #include "modules/mediarecorder/MediaRecorderOptions.h" 13 #include "modules/mediarecorder/MediaRecorderOptions.h"
14 #include "modules/mediastream/MediaStream.h" 14 #include "modules/mediastream/MediaStream.h"
15 #include "platform/AsyncMethodRunner.h" 15 #include "platform/AsyncMethodRunner.h"
16 #include "public/platform/WebMediaRecorderHandler.h" 16 #include "public/platform/WebMediaRecorderHandler.h"
17 #include "public/platform/WebMediaRecorderHandlerClient.h" 17 #include "public/platform/WebMediaRecorderHandlerClient.h"
18 #include <memory>
19 18
20 namespace blink { 19 namespace blink {
21 20
22 class Blob; 21 class Blob;
23 class BlobData; 22 class BlobData;
24 class ExceptionState; 23 class ExceptionState;
25 24
26 class MODULES_EXPORT MediaRecorder final 25 class MODULES_EXPORT MediaRecorder final
27 : public EventTargetWithInlineData 26 : public EventTargetWithInlineData
28 , public WebMediaRecorderHandlerClient 27 , public WebMediaRecorderHandlerClient
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 Member<MediaStream> m_stream; 95 Member<MediaStream> m_stream;
97 size_t m_streamAmountOfTracks; 96 size_t m_streamAmountOfTracks;
98 String m_mimeType; 97 String m_mimeType;
99 bool m_stopped; 98 bool m_stopped;
100 bool m_ignoreMutedMedia; 99 bool m_ignoreMutedMedia;
101 int m_audioBitsPerSecond; 100 int m_audioBitsPerSecond;
102 int m_videoBitsPerSecond; 101 int m_videoBitsPerSecond;
103 102
104 State m_state; 103 State m_state;
105 104
106 std::unique_ptr<BlobData> m_blobData; 105 OwnPtr<BlobData> m_blobData;
107 106
108 std::unique_ptr<WebMediaRecorderHandler> m_recorderHandler; 107 OwnPtr<WebMediaRecorderHandler> m_recorderHandler;
109 108
110 Member<AsyncMethodRunner<MediaRecorder>> m_dispatchScheduledEventRunner; 109 Member<AsyncMethodRunner<MediaRecorder>> m_dispatchScheduledEventRunner;
111 HeapVector<Member<Event>> m_scheduledEvents; 110 HeapVector<Member<Event>> m_scheduledEvents;
112 }; 111 };
113 112
114 } // namespace blink 113 } // namespace blink
115 114
116 #endif // MediaRecorder_h 115 #endif // MediaRecorder_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698