ChangeLog

2013-09-14  Thiago de Barros Lacerda  <thiago.lacerda@openbossa.org>

        MediaStream API: Storing the constraints in MediaStreamSource

        https://bugs.webkit.org/show_bug.cgi?id=120882

        Reviewed by NOBODY (OOPS!).

        No new tests needed.

        * Modules/mediastream/UserMediaRequest.cpp:

        (WebCore::UserMediaRequest::succeed):

        * platform/mediastream/MediaStreamSource.h:

        (WebCore::MediaStreamSource::setConstraints):

        (WebCore::MediaStreamSource::constraints):

2013-09-14  Sam Weinig  <sam@webkit.org>

        [CTTE] Node subclasses should take a Document by reference in their constructor (Part 3)

Source/WebCore/Modules/mediastream/UserMediaRequest.cpp

@@void UserMediaRequest::succeed(PassRefPtr<MediaStreamDescriptor> streamDescripto

        return;

    RefPtr<MediaStream> stream = MediaStream::create(m_scriptExecutionContext, streamDescriptor);

    MediaStreamTrackVector audioTracks = stream->getAudioTracks();

    for (MediaStreamTrackVector::iterator iter = audioTracks.begin(); iter != audioTracks.end(); ++iter)

        (*iter)->component()->source()->setConstraints(m_audio);

    MediaStreamTrackVector videoTracks = stream->getVideoTracks();

    for (MediaStreamTrackVector::iterator iter = videoTracks.begin(); iter != videoTracks.end(); ++iter)

        (*iter)->component()->source()->setConstraints(m_video);

    m_successCallback->handleEvent(stream.get());

}

Source/WebCore/platform/mediastream/MediaStreamSource.h

#if ENABLE(MEDIA_STREAM)

#include "AudioDestinationConsumer.h"

38#include "MediaConstraints.h"

#include <wtf/RefCounted.h>

#include <wtf/Vector.h>

#include <wtf/text/WTFString.h>

@@public:

    PassRefPtr<ExtraData> extraData() const { return m_extraData; }

    void setExtraData(PassRefPtr<ExtraData> extraData) { m_extraData = extraData; }

    void setConstraints(PassRefPtr<MediaConstraints> constraints) { m_constraints = constraints; }

    MediaConstraints* constraints() { return m_constraints.get(); }

    const String& deviceId() { return m_deviceId; }

    void setDeviceId(const String& deviceId) { m_deviceId = deviceId; }

@@private:

    Mutex m_audioConsumersLock;

    Vector<RefPtr<AudioDestinationConsumer> > m_audioConsumers;

    RefPtr<ExtraData> m_extraData;

111 RefPtr<MediaConstraints> m_constraints;

};

typedef Vector<RefPtr<MediaStreamSource> > MediaStreamSourceVector;