Changeset 140017 in webkit


Ignore:
Timestamp:
Jan 17, 2013 11:48:14 AM (11 years ago)
Author:
tommyw@google.com
Message:

MediaStream API: Move all ExtraDataContainers into anonymous namespaces
​https://bugs.webkit.org/show_bug.cgi?id=107128

Reviewed by Kentaro Hara.

Tests not needed.

  • platform/chromium/support/WebMediaStreamDescriptor.cpp:
  • platform/chromium/support/WebMediaStreamSource.cpp:
  • platform/chromium/support/WebRTCSessionDescriptionRequest.cpp:
  • platform/chromium/support/WebRTCVoidRequest.cpp:
Location:
trunk/Source/WebCore
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebCore/ChangeLog

    r140015 r140017  
     12013-01-17  Tommy Widenflycht  <tommyw@google.com>
     2
     3        MediaStream API: Move all ExtraDataContainers into anonymous namespaces
     4        https://bugs.webkit.org/show_bug.cgi?id=107128
     5
     6        Reviewed by Kentaro Hara.
     7
     8        Tests not needed.
     9
     10        * platform/chromium/support/WebMediaStreamDescriptor.cpp:
     11        * platform/chromium/support/WebMediaStreamSource.cpp:
     12        * platform/chromium/support/WebRTCSessionDescriptionRequest.cpp:
     13        * platform/chromium/support/WebRTCVoidRequest.cpp:
     14
    1152013-01-17  Yury Semikhatsky  <yurys@chromium.org>
    216

  • trunk/Source/WebCore/platform/chromium/support/WebMediaStreamDescriptor.cpp

    r139352 r140017  
    4949namespace WebKit {
    5050
     51namespace {
     52
     53class ExtraDataContainer : public MediaStreamDescriptor::ExtraData {
     54public:
     55    ExtraDataContainer(WebMediaStreamDescriptor::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
     56
     57    WebMediaStreamDescriptor::ExtraData* extraData() { return m_extraData.get(); }
     58
     59private:
     60    OwnPtr<WebMediaStreamDescriptor::ExtraData> m_extraData;
     61};
     62
     63} // namespace
     64
    5165WebMediaStreamDescriptor::WebMediaStreamDescriptor(const PassRefPtr<WebCore::MediaStreamDescriptor>& mediaStreamDescriptor)
    5266    : m_private(mediaStreamDescriptor)
    … …  
    7387    return m_private->id();
    7488}
    75 
    76 class ExtraDataContainer : public WebCore::MediaStreamDescriptor::ExtraData {
    77 public:
    78     ExtraDataContainer(WebMediaStreamDescriptor::ExtraData* extraData) : m_extraData(WTF::adoptPtr(extraData)) { }
    79 
    80     WebMediaStreamDescriptor::ExtraData* extraData() { return m_extraData.get(); }
    81 
    82 private:
    83     OwnPtr<WebMediaStreamDescriptor::ExtraData> m_extraData;
    84 };
    8589
    8690WebMediaStreamDescriptor::ExtraData* WebMediaStreamDescriptor::extraData() const

  • trunk/Source/WebCore/platform/chromium/support/WebMediaStreamSource.cpp

    r138895 r140017  
    4747namespace WebKit {
    4848
    49 WebMediaStreamSource::WebMediaStreamSource(const PassRefPtr<MediaStreamSource>& mediaStreamSource)
    50     : m_private(mediaStreamSource)
    51 {
    52 }
    53 
    54 WebMediaStreamSource& WebMediaStreamSource::operator=(WebCore::MediaStreamSource* mediaStreamSource)
    55 {
    56     m_private = mediaStreamSource;
    57     return *this;
    58 }
    59 
    60 void WebMediaStreamSource::assign(const WebMediaStreamSource& other)
    61 {
    62     m_private = other.m_private;
    63 }
    64 
    65 void WebMediaStreamSource::reset()
    66 {
    67     m_private.reset();
    68 }
    69 
    70 WebMediaStreamSource::operator PassRefPtr<MediaStreamSource>() const
    71 {
    72     return m_private.get();
    73 }
    74 
    75 WebMediaStreamSource::operator MediaStreamSource*() const
    76 {
    77     return m_private.get();
    78 }
    79 
    80 void WebMediaStreamSource::initialize(const WebString& id, Type type, const WebString& name)
    81 {
    82     m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::Type>(type), name);
    83 }
    84 
    85 WebString WebMediaStreamSource::id() const
    86 {
    87     ASSERT(!m_private.isNull());
    88     return m_private.get()->id();
    89 }
    90 
    91 WebMediaStreamSource::Type WebMediaStreamSource::type() const
    92 {
    93     ASSERT(!m_private.isNull());
    94     return static_cast<Type>(m_private.get()->type());
    95 }
    96 
    97 WebString WebMediaStreamSource::name() const
    98 {
    99     ASSERT(!m_private.isNull());
    100     return m_private.get()->name();
    101 }
    102 
    103 void WebMediaStreamSource::setReadyState(ReadyState state)
    104 {
    105     ASSERT(!m_private.isNull());
    106     m_private->setReadyState(static_cast<MediaStreamSource::ReadyState>(state));
    107 }
    108 
    109 WebMediaStreamSource::ReadyState WebMediaStreamSource::readyState() const
    110 {
    111     ASSERT(!m_private.isNull());
    112     return static_cast<ReadyState>(m_private->readyState());
    113 }
    114 
    115 class ExtraDataContainer : public WebCore::MediaStreamSource::ExtraData {
     49namespace {
     50
     51class ExtraDataContainer : public MediaStreamSource::ExtraData {
    11652public:
    117     ExtraDataContainer(WebMediaStreamSource::ExtraData* extraData) : m_extraData(WTF::adoptPtr(extraData)) { }
     53    ExtraDataContainer(WebMediaStreamSource::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
    11854
    11955    WebMediaStreamSource::ExtraData* extraData() { return m_extraData.get(); }
    … …  
    12258    OwnPtr<WebMediaStreamSource::ExtraData> m_extraData;
    12359};
     60
     61} // namespace
     62
     63WebMediaStreamSource::WebMediaStreamSource(const PassRefPtr<MediaStreamSource>& mediaStreamSource)
     64    : m_private(mediaStreamSource)
     65{
     66}
     67
     68WebMediaStreamSource& WebMediaStreamSource::operator=(WebCore::MediaStreamSource* mediaStreamSource)
     69{
     70    m_private = mediaStreamSource;
     71    return *this;
     72}
     73
     74void WebMediaStreamSource::assign(const WebMediaStreamSource& other)
     75{
     76    m_private = other.m_private;
     77}
     78
     79void WebMediaStreamSource::reset()
     80{
     81    m_private.reset();
     82}
     83
     84WebMediaStreamSource::operator PassRefPtr<MediaStreamSource>() const
     85{
     86    return m_private.get();
     87}
     88
     89WebMediaStreamSource::operator MediaStreamSource*() const
     90{
     91    return m_private.get();
     92}
     93
     94void WebMediaStreamSource::initialize(const WebString& id, Type type, const WebString& name)
     95{
     96    m_private = MediaStreamSource::create(id, static_cast<MediaStreamSource::Type>(type), name);
     97}
     98
     99WebString WebMediaStreamSource::id() const
     100{
     101    ASSERT(!m_private.isNull());
     102    return m_private.get()->id();
     103}
     104
     105WebMediaStreamSource::Type WebMediaStreamSource::type() const
     106{
     107    ASSERT(!m_private.isNull());
     108    return static_cast<Type>(m_private.get()->type());
     109}
     110
     111WebString WebMediaStreamSource::name() const
     112{
     113    ASSERT(!m_private.isNull());
     114    return m_private.get()->name();
     115}
     116
     117void WebMediaStreamSource::setReadyState(ReadyState state)
     118{
     119    ASSERT(!m_private.isNull());
     120    m_private->setReadyState(static_cast<MediaStreamSource::ReadyState>(state));
     121}
     122
     123WebMediaStreamSource::ReadyState WebMediaStreamSource::readyState() const
     124{
     125    ASSERT(!m_private.isNull());
     126    return static_cast<ReadyState>(m_private->readyState());
     127}
    124128
    125129WebMediaStreamSource::ExtraData* WebMediaStreamSource::extraData() const

  • trunk/Source/WebCore/platform/chromium/support/WebRTCSessionDescriptionRequest.cpp

    r128064 r140017  
    4444namespace WebKit {
    4545
     46namespace {
     47
     48class ExtraDataContainer : public RTCSessionDescriptionRequest::ExtraData {
     49public:
     50    ExtraDataContainer(WebRTCSessionDescriptionRequest::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
     51
     52    WebRTCSessionDescriptionRequest::ExtraData* extraData() { return m_extraData.get(); }
     53
     54private:
     55    OwnPtr<WebRTCSessionDescriptionRequest::ExtraData> m_extraData;
     56};
     57
     58} // namespace
     59
    4660WebRTCSessionDescriptionRequest::WebRTCSessionDescriptionRequest(const PassRefPtr<RTCSessionDescriptionRequest>& constraints)
    4761    : m_private(constraints)
    … …  
    7185}
    7286
    73 class ExtraDataContainer : public WebCore::RTCSessionDescriptionRequest::ExtraData {
    74 public:
    75     ExtraDataContainer(WebRTCSessionDescriptionRequest::ExtraData* extraData) : m_extraData(WTF::adoptPtr(extraData)) { }
    76 
    77     WebRTCSessionDescriptionRequest::ExtraData* extraData() { return m_extraData.get(); }
    78 
    79 private:
    80     OwnPtr<WebRTCSessionDescriptionRequest::ExtraData> m_extraData;
    81 };
    82 
    8387WebRTCSessionDescriptionRequest::ExtraData* WebRTCSessionDescriptionRequest::extraData() const
    8488{

  • trunk/Source/WebCore/platform/chromium/support/WebRTCVoidRequest.cpp

    r127766 r140017  
    4242namespace WebKit {
    4343
     44namespace {
     45
     46class ExtraDataContainer : public RTCVoidRequest::ExtraData {
     47public:
     48    ExtraDataContainer(WebRTCVoidRequest::ExtraData* extraData) : m_extraData(adoptPtr(extraData)) { }
     49
     50    WebRTCVoidRequest::ExtraData* extraData() { return m_extraData.get(); }
     51
     52private:
     53    OwnPtr<WebRTCVoidRequest::ExtraData> m_extraData;
     54};
     55
     56} // namespace
     57
    4458WebRTCVoidRequest::WebRTCVoidRequest(const PassRefPtr<RTCVoidRequest>& constraints)
    4559    : m_private(constraints)
    … …  
    6983}
    7084
    71 class ExtraDataContainer : public WebCore::RTCVoidRequest::ExtraData {
    72 public:
    73     ExtraDataContainer(WebRTCVoidRequest::ExtraData* extraData) : m_extraData(WTF::adoptPtr(extraData)) { }
    74 
    75     WebRTCVoidRequest::ExtraData* extraData() { return m_extraData.get(); }
    76 
    77 private:
    78     OwnPtr<WebRTCVoidRequest::ExtraData> m_extraData;
    79 };
    80 
    8185WebRTCVoidRequest::ExtraData* WebRTCVoidRequest::extraData() const
    8286{
Note: See TracChangeset for help on using the changeset viewer.