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

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

Issue 604753003: Removing #ifdefs for WEB_AUDIO compile time flag. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
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
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 122 matching lines...) Expand 10 before | Expand all | Expand 10 after
133 ASSERT(!m_private.isNull()); 133 ASSERT(!m_private.isNull());
134 134
135 if (extraData) 135 if (extraData)
136 extraData->setOwner(m_private.get()); 136 extraData->setOwner(m_private.get());
137 137
138 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData)) )); 138 m_private->setExtraData(adoptPtr(new ExtraDataContainer(adoptPtr(extraData)) ));
139 } 139 }
140 140
141 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider) 141 void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider)
142 { 142 {
143 #if ENABLE(WEB_AUDIO)
144 ASSERT(!m_private.isNull()); 143 ASSERT(!m_private.isNull());
145 m_private->setSourceProvider(provider); 144 m_private->setSourceProvider(provider);
146 #endif // ENABLE(WEB_AUDIO)
147 } 145 }
148 146
149 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other) 147 void WebMediaStreamTrack::assign(const WebMediaStreamTrack& other)
150 { 148 {
151 m_private = other.m_private; 149 m_private = other.m_private;
152 } 150 }
153 151
154 } // namespace blink 152 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698