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

Unified 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | public/platform/WebMediaStreamTrack.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/platform/chromium/support/WebMediaStreamTrack.cpp
diff --git a/Source/core/platform/chromium/support/WebMediaStreamTrack.cpp b/Source/core/platform/chromium/support/WebMediaStreamTrack.cpp
index 39dabdfa8f3ce0761006e254c2b4f3de78b2c592..9ff1881c9594aaeefac9039b615c8b2c6f86e7b5 100644
--- a/Source/core/platform/chromium/support/WebMediaStreamTrack.cpp
+++ b/Source/core/platform/chromium/support/WebMediaStreamTrack.cpp
@@ -52,6 +52,18 @@ private:
} // namespace
+WebMediaStreamTrack WebMediaStreamTrack::ExtraData::owner()
+{
+ ASSERT(m_owner);
+ return WebMediaStreamTrack(m_owner);
+}
+
+void WebMediaStreamTrack::ExtraData::setOwner(WebCore::MediaStreamComponent* owner)
+{
+ ASSERT(!m_owner);
+ m_owner = owner;
+}
+
WebMediaStreamTrack::WebMediaStreamTrack(PassRefPtr<WebCore::MediaStreamComponent> mediaStreamComponent)
: m_private(mediaStreamComponent)
{
@@ -127,6 +139,11 @@ WebMediaStreamTrack::ExtraData* WebMediaStreamTrack::extraData() const
void WebMediaStreamTrack::setExtraData(ExtraData* extraData)
{
+ ASSERT(!m_private.isNull());
+
+ if (extraData)
+ extraData->setOwner(m_private.get());
+
m_private->setExtraData(adoptRef(new ExtraDataContainer(adoptPtr(extraData))));
}
« 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