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

Side by Side Diff: third_party/WebKit/Source/platform/mediastream/MediaStreamSource.h

Issue 2765073004: Revert of MediaStreamSource: verify unlocked state when finalizing. (Closed)
Patch Set: rebased upto r458724 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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Ericsson AB. All rights reserved. 2 * Copyright (C) 2011 Ericsson AB. All rights reserved.
3 * Copyright (C) 2012 Google Inc. All rights reserved. 3 * Copyright (C) 2012 Google Inc. All rights reserved.
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions 6 * modification, are permitted provided that the following conditions
7 * are met: 7 * are met:
8 * 8 *
9 * 1. Redistributions of source code must retain the above copyright 9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
67 ReadyStateMuted = 1, 67 ReadyStateMuted = 1,
68 ReadyStateEnded = 2 68 ReadyStateEnded = 2
69 }; 69 };
70 70
71 static MediaStreamSource* create(const String& id, 71 static MediaStreamSource* create(const String& id,
72 StreamType, 72 StreamType,
73 const String& name, 73 const String& name,
74 ReadyState = ReadyStateLive, 74 ReadyState = ReadyStateLive,
75 bool requiresConsumer = false); 75 bool requiresConsumer = false);
76 76
77 ~MediaStreamSource();
78
79 const String& id() const { return m_id; } 77 const String& id() const { return m_id; }
80 StreamType type() const { return m_type; } 78 StreamType type() const { return m_type; }
81 const String& name() const { return m_name; } 79 const String& name() const { return m_name; }
82 80
83 void setReadyState(ReadyState); 81 void setReadyState(ReadyState);
84 ReadyState getReadyState() const { return m_readyState; } 82 ReadyState getReadyState() const { return m_readyState; }
85 83
86 void addObserver(Observer*); 84 void addObserver(Observer*);
87 85
88 ExtraData* getExtraData() const { return m_extraData.get(); } 86 ExtraData* getExtraData() const { return m_extraData.get(); }
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 HashSet<AudioDestinationConsumer*> m_audioConsumers; 127 HashSet<AudioDestinationConsumer*> m_audioConsumers;
130 std::unique_ptr<ExtraData> m_extraData; 128 std::unique_ptr<ExtraData> m_extraData;
131 WebMediaConstraints m_constraints; 129 WebMediaConstraints m_constraints;
132 }; 130 };
133 131
134 typedef HeapVector<Member<MediaStreamSource>> MediaStreamSourceVector; 132 typedef HeapVector<Member<MediaStreamSource>> MediaStreamSourceVector;
135 133
136 } // namespace blink 134 } // namespace blink
137 135
138 #endif // MediaStreamSource_h 136 #endif // MediaStreamSource_h
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/mediastream/MediaStreamSource.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698