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

Side by Side Diff: Source/core/platform/chromium/support/WebMediaStreamTrack.cpp

Issue 133733004: Adding owner access from WebMediaStreamTrack::ExtraData (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Fixed win Created 6 years, 11 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 | « no previous file | public/platform/WebMediaStreamTrack.h » ('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) 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 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(extraData) { } 45 explicit ExtraDataContainer(PassOwnPtr<WebMediaStreamTrack::ExtraData> extra Data) : m_extraData(extraData) { }
46 46
47 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); } 47 WebMediaStreamTrack::ExtraData* extraData() { return m_extraData.get(); }
48 48
49 private: 49 private:
50 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData; 50 OwnPtr<WebMediaStreamTrack::ExtraData> m_extraData;
51 }; 51 };
52 52
53 } // namespace 53 } // namespace
54 54
55 WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner()
56 {
57 ASSERT(m_owner);
58 return WebMediaStreamTrack(m_owner);
59 }
60
61 void WebMediaStreamTrack::ExtraData::setOwner(WebCore::MediaStreamComponent* own er)
62 {
63 ASSERT(!m_owner);
64 m_owner = owner;
65 }
66
55 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponen t> mediaStreamComponent) 67 WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponen t> mediaStreamComponent)
56 : m_private(mediaStreamComponent) 68 : m_private(mediaStreamComponent)
57 { 69 {
58 } 70 }
59 71
60 WebMediaStreamTrack::WebMediaStreamTrack(WebCore::MediaStreamComponent* mediaStr eamComponent) 72 WebMediaStreamTrack::WebMediaStreamTrack(WebCore::MediaStreamComponent* mediaStr eamComponent)
61 : m_private(mediaStreamComponent) 73 : m_private(mediaStreamComponent)
62 { 74 {
63 } 75 }
64 76
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
120 WebMediaStreamTrack::ExtraData* WebMediaStreamTrack::extraData() const 132 WebMediaStreamTrack::ExtraData* WebMediaStreamTrack::extraData() const
121 { 133 {
122 RefPtr<MediaStreamComponent::ExtraData> data = m_private->extraData(); 134 RefPtr<MediaStreamComponent::ExtraData> data = m_private->extraData();
123 if (!data) 135 if (!data)
124 return 0; 136 return 0;
125 return static_cast<ExtraDataContainer*>(data.get())->extraData(); 137 return static_cast<ExtraDataContainer*>(data.get())->extraData();
126 } 138 }
127 139
128 void WebMediaStreamTrack::setExtraData(ExtraData* extraData) 140 void WebMediaStreamTrack::setExtraData(ExtraData* extraData)
129 { 141 {
142 ASSERT(!m_private.isNull());
143
144 if (extraData)
145 extraData->setOwner(m_private.get());
146
130 m_private->setExtraData(adoptRef(new ExtraDataContainer(adoptPtr(extraData)) )); 147 m_private->setExtraData(adoptRef(new ExtraDataContainer(adoptPtr(extraData)) ));
131 } 148 }
132 149
133 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider) 150 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider)
134 { 151 {
135 #if ENABLE(WEB_AUDIO) 152 #if ENABLE(WEB_AUDIO)
136 ASSERT(!m_private.isNull()); 153 ASSERT(!m_private.isNull());
137 m_private->setSourceProvider(provider); 154 m_private->setSourceProvider(provider);
138 #endif // ENABLE(WEB_AUDIO) 155 #endif // ENABLE(WEB_AUDIO)
139 } 156 }
140 157
141 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) 158 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
142 { 159 {
143 m_private = other.m_private; 160 m_private = other.m_private;
144 } 161 }
145 162
146 } // namespace blink 163 } // namespace blink
OLDNEW
« no previous file with comments | « no previous file | public/platform/WebMediaStreamTrack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698