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

Side by Side Diff: third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp

Issue 1363143003: [Oilpan] Move MediaStream{Source|Component|Descriptor} to Oilpan heap (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes in PS8 Created 5 years, 2 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 /* 1 /*
2 * Copyright (C) 2013 Google Inc. All rights reserved. 2 * Copyright (C) 2013 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(extraData) { } 42 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(extraData) { }
43 43
44 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); } 44 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); }
45 45
46 private: 46 private:
47 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData; 47 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData;
48 }; 48 };
49 49
50 } // namespace 50 } // namespace
51 51
52 WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner()
53 {
54 ASSERT(m_owner);
55 return WebMediaStreamTrack(m_owner);
56 }
57
58 void WebMediaStreamTrack::ExtraData::setOwner(MediaStreamComponent* owner)
59 {
60 ASSERT(!m_owner);
61 m_owner = owner;
62 }
63
64 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<MediaStreamComponent> mediaS treamComponent)
65 : m_private(mediaStreamComponent)
66 {
67 }
68
69 WebMediaStreamTrack::WebMediaStreamTrack(MediaStreamComponent* mediaStreamCompon ent) 52 WebMediaStreamTrack::WebMediaStreamTrack(MediaStreamComponent* mediaStreamCompon ent)
70 : m_private(mediaStreamComponent) 53 : m_private(mediaStreamComponent)
71 { 54 {
72 } 55 }
73 56
74 WebMediaStreamTrack& WebMediaStreamTrack::operator=(MediaStreamComponent* mediaS treamComponent) 57 WebMediaStreamTrack& WebMediaStreamTrack::operator=(MediaStreamComponent* mediaS treamComponent)
75 { 58 {
76 m_private = mediaStreamComponent; 59 m_private = mediaStreamComponent;
77 return *this; 60 return *this;
78 } 61 }
79 62
80 void WebMediaStreamTrack::initialize(const WebMediaStreamSource& source) 63 void WebMediaStreamTrack::initialize(const WebMediaStreamSource& source)
81 { 64 {
82 m_private = MediaStreamComponent::create(source); 65 m_private = MediaStreamComponent::create(source);
83 } 66 }
84 67
85 void WebMediaStreamTrack::initialize(const WebString& id, const WebMediaStreamSo urce& source) 68 void WebMediaStreamTrack::initialize(const WebString& id, const WebMediaStreamSo urce& source)
86 { 69 {
87 m_private = MediaStreamComponent::create(id, source); 70 m_private = MediaStreamComponent::create(id, source);
88 } 71 }
89 72
90 void WebMediaStreamTrack::reset() 73 void WebMediaStreamTrack::reset()
91 { 74 {
92 m_private.reset(); 75 m_private.reset();
93 } 76 }
94 77
95 WebMediaStreamTrack::operator PassRefPtr<MediaStreamComponent>() const
96 {
97 return m_private.get();
98 }
99
100 WebMediaStreamTrack::operator MediaStreamComponent*() const 78 WebMediaStreamTrack::operator MediaStreamComponent*() const
101 { 79 {
102 return m_private.get(); 80 return m_private.get();
103 } 81 }
104 82
105 bool WebMediaStreamTrack::isEnabled() const 83 bool WebMediaStreamTrack::isEnabled() const
106 { 84 {
107 ASSERT(!m_private.isNull()); 85 ASSERT(!m_private.isNull());
108 return m_private->enabled(); 86 return m_private->enabled();
109 } 87 }
(...skipping 21 matching lines...) Expand all
131 MediaStreamComponent::ExtraData* data = m_private->extraData(); 109 MediaStreamComponent::ExtraData* data = m_private->extraData();
132 if (!data) 110 if (!data)
133 return 0; 111 return 0;
134 return static_cast<ExtraDataContainer*>(data)->extraData(); 112 return static_cast<ExtraDataContainer*>(data)->extraData();
135 } 113 }
136 114
137 void WebMediaStreamTrack::setExtraData(ExtraData* extraData) 115 void WebMediaStreamTrack::setExtraData(ExtraData* extraData)
138 { 116 {
139 ASSERT(!m_private.isNull()); 117 ASSERT(!m_private.isNull());
140 118
141 if (extraData)
142 extraData->setOwner(m_private.get());
143
144 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData)) )); 119 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData)) ));
145 } 120 }
146 121
147 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider) 122 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider)
148 { 123 {
149 #if ENABLE(WEB_AUDIO) 124 #if ENABLE(WEB_AUDIO)
150 ASSERT(!m_private.isNull()); 125 ASSERT(!m_private.isNull());
151 m_private->setSourceProvider(provider); 126 m_private->setSourceProvider(provider);
152 #endif // ENABLE(WEB_AUDIO) 127 #endif // ENABLE(WEB_AUDIO)
153 } 128 }
154 129
155 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) 130 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
156 { 131 {
157 m_private = other.m_private; 132 m_private = other.m_private;
158 } 133 }
159 134
160 } // namespace blink 135 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698