Source/modules/mediastream/MediaStreamTrack.h - Issue 534473002: Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor

Side by Side Diff: Source/modules/mediastream/MediaStreamTrack.h

Issue 534473002: Revert of Oilpan: Move MediaStreamSource, MediaStreamComponent and MediaStreamDescriptor (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 3 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 | Annotate | Revision Log

« no previous file with comments | « Source/modules/mediastream/MediaStreamRegistry.h ('k') | Source/modules/mediastream/MediaStreamTrack.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2011 Google Inc. All rights reserved.	2 * Copyright (C) 2011 Google Inc. All rights reserved.

3 * Copyright (C) 2011 Ericsson AB. All rights reserved.	3 * Copyright (C) 2011 Ericsson AB. 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 * 1. Redistributions of source code must retain the above copyright	8 * 1. Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 28 matching lines...) Expand all Loading...
39 class ExceptionState;	39 class ExceptionState;

40 class MediaStreamComponent;	40 class MediaStreamComponent;

41 class MediaStreamTrackSourcesCallback;	41 class MediaStreamTrackSourcesCallback;

42	42

43 class MediaStreamTrack FINAL	43 class MediaStreamTrack FINAL

44 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStre amTrack>	44 : public RefCountedGarbageCollectedWillBeGarbageCollectedFinalized<MediaStre amTrack>

45 , public ActiveDOMObject	45 , public ActiveDOMObject

46 , public EventTargetWithInlineData	46 , public EventTargetWithInlineData

47 , public MediaStreamSource::Observer {	47 , public MediaStreamSource::Observer {

48 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi llBeGarbageCollectedFinalized<MediaStreamTrack>);	48 DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollectedWi llBeGarbageCollectedFinalized<MediaStreamTrack>);

49 USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);	49 WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaStreamTrack);

50 public:	50 public:

51 static MediaStreamTrack* create(ExecutionContext, MediaStreamComponent);	51 static MediaStreamTrack* create(ExecutionContext, MediaStreamComponent);

52 virtual ~MediaStreamTrack();	52 virtual ~MediaStreamTrack();

53	53

54 String kind() const;	54 String kind() const;

55 String id() const;	55 String id() const;

56 String label() const;	56 String label() const;

57	57

58 bool enabled() const;	58 bool enabled() const;

59 void setEnabled(bool);	59 void setEnabled(bool);

(...skipping 32 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
92	92

93 // MediaStreamSourceObserver	93 // MediaStreamSourceObserver

94 virtual void sourceChangedState() OVERRIDE;	94 virtual void sourceChangedState() OVERRIDE;

95	95

96 void propagateTrackEnded();	96 void propagateTrackEnded();

97	97

98 MediaStreamSource::ReadyState m_readyState;	98 MediaStreamSource::ReadyState m_readyState;

99 HeapHashSet<Member<MediaStream> > m_registeredMediaStreams;	99 HeapHashSet<Member<MediaStream> > m_registeredMediaStreams;

100 bool m_isIteratingRegisteredMediaStreams;	100 bool m_isIteratingRegisteredMediaStreams;

101 bool m_stopped;	101 bool m_stopped;

102 Member<MediaStreamComponent> m_component;	102 RefPtr<MediaStreamComponent> m_component;

103 };	103 };

104	104

105 typedef HeapVector<Member<MediaStreamTrack> > MediaStreamTrackVector;	105 typedef HeapVector<Member<MediaStreamTrack> > MediaStreamTrackVector;

106	106

107 } // namespace blink	107 } // namespace blink

108	108

109 #endif // MediaStreamTrack_h	109 #endif // MediaStreamTrack_h

OLD	NEW