Revert of Remove |remote| and |readonly| members of MediaStreamTrack.

third_party/WebKit/Source/platform/exported/WebMediaStreamSource.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 39 matching lines @@
 
   WebMediaStreamSource::ExtraData* getExtraData() { return m_extraData.get(); }
 
  private:
   std::unique_ptr<WebMediaStreamSource::ExtraData> m_extraData;
 };
 
 }  // namespace
 
 WebMediaStreamSource WebMediaStreamSource::ExtraData::owner() {
-  ASSERT(m_owner);
+  DCHECK(m_owner);
   return WebMediaStreamSource(m_owner);
 }
 
 void WebMediaStreamSource::ExtraData::setOwner(MediaStreamSource* owner) {
-  ASSERT(!m_owner);
+  DCHECK(!m_owner);
   m_owner = owner;
 }
 
 WebMediaStreamSource::WebMediaStreamSource(MediaStreamSource* mediaStreamSource)
     : m_private(mediaStreamSource) {}
 
 WebMediaStreamSource& WebMediaStreamSource::operator=(
     MediaStreamSource* mediaStreamSource) {
   m_private = mediaStreamSource;
   return *this;
 }
 
 void WebMediaStreamSource::assign(const WebMediaStreamSource& other) {
   m_private = other.m_private;
 }
 
 void WebMediaStreamSource::reset() {
   m_private.reset();
 }
 
 WebMediaStreamSource::operator MediaStreamSource*() const {
   return m_private.get();
 }
 
 void WebMediaStreamSource::initialize(const WebString& id,
                                       Type type,
                                       const WebString& name) {
   m_private = MediaStreamSource::create(
-      id, static_cast<MediaStreamSource::StreamType>(type), name);
+      id, static_cast<MediaStreamSource::StreamType>(type), name, false);
+}
+
+void WebMediaStreamSource::initialize(const WebString& id,
+                                      Type type,
+                                      const WebString& name,
+                                      bool remote) {
+  m_private = MediaStreamSource::create(
+      id, static_cast<MediaStreamSource::StreamType>(type), name, remote);
 }
 
 WebString WebMediaStreamSource::id() const {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
   return m_private.get()->id();
 }
 
 WebMediaStreamSource::Type WebMediaStreamSource::getType() const {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
   return static_cast<Type>(m_private.get()->type());
 }
 
 WebString WebMediaStreamSource::name() const {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
   return m_private.get()->name();
 }
 
+bool WebMediaStreamSource::remote() const {
+  DCHECK(!m_private.isNull());
+  return m_private.get()->remote();
+}
+
 void WebMediaStreamSource::setReadyState(ReadyState state) {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
   m_private->setReadyState(static_cast<MediaStreamSource::ReadyState>(state));
 }
 
 WebMediaStreamSource::ReadyState WebMediaStreamSource::getReadyState() const {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
   return static_cast<ReadyState>(m_private->getReadyState());
 }
 
 WebMediaStreamSource::ExtraData* WebMediaStreamSource::getExtraData() const {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
   MediaStreamSource::ExtraData* data = m_private->getExtraData();
   if (!data)
     return 0;
   return static_cast<ExtraDataContainer*>(data)->getExtraData();
 }
 
 void WebMediaStreamSource::setExtraData(ExtraData* extraData) {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
 
   if (extraData)
     extraData->setOwner(m_private.get());
 
   m_private->setExtraData(
       WTF::wrapUnique(new ExtraDataContainer(WTF::wrapUnique(extraData))));
 }
 
 WebMediaConstraints WebMediaStreamSource::constraints() {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
   return m_private->constraints();
 }
 
 bool WebMediaStreamSource::requiresAudioConsumer() const {
-  ASSERT(!m_private.isNull());
+  DCHECK(!m_private.isNull());
   return m_private->requiresAudioConsumer();
 }
 
 class ConsumerWrapper final : public AudioDestinationConsumer {
   USING_FAST_MALLOC(ConsumerWrapper);
 
  public:
   static ConsumerWrapper* create(WebAudioDestinationConsumer* consumer) {
     return new ConsumerWrapper(consumer);
   }
@@ skipping 23 matching lines @@
   size_t numberOfChannels = bus->numberOfChannels();
   WebVector<const float*> busVector(numberOfChannels);
   for (size_t i = 0; i < numberOfChannels; ++i)
     busVector[i] = bus->channel(i)->data();
 
   m_consumer->consumeAudio(busVector, numberOfFrames);
 }
 
 void WebMediaStreamSource::addAudioConsumer(
     WebAudioDestinationConsumer* consumer) {
-  ASSERT(isMainThread());
-  ASSERT(!m_private.isNull() && consumer);
+  DCHECK(isMainThread());
+  DCHECK(!m_private.isNull() && consumer);
 
   m_private->addAudioConsumer(ConsumerWrapper::create(consumer));
 }
 
 bool WebMediaStreamSource::removeAudioConsumer(
     WebAudioDestinationConsumer* consumer) {
-  ASSERT(isMainThread());
-  ASSERT(!m_private.isNull() && consumer);
+  DCHECK(isMainThread());
+  DCHECK(!m_private.isNull() && consumer);
 
   const HashSet<AudioDestinationConsumer*>& consumers =
       m_private->audioConsumers();
   for (AudioDestinationConsumer* it : consumers) {
     ConsumerWrapper* wrapper = static_cast<ConsumerWrapper*>(it);
     if (wrapper->consumer() == consumer) {
       m_private->removeAudioConsumer(wrapper);
       return true;
     }
   }
   return false;
 }
 
 }  // namespace blink