Changeset 141444 in webkit


Ignore:
Timestamp:
Jan 31, 2013 11:01:31 AM (11 years ago)
Author:
tommyw@google.com
Message:

[chromium] MediaStream API: Rename WebMediaStreamDescriptor and WebMediaStreamComponent to WebMediaStream and WebMediaStreamTrack
​https://bugs.webkit.org/show_bug.cgi?id=108458

Source/Platform:

Only renames, no other code changes.

Reviewed by Adam Barth.

  • Platform.gypi:
  • chromium/public/WebMediaStream.h: Copied from Source/Platform/chromium/public/WebMediaStreamDescriptor.h.

(WebCore):
(WebKit):
(WebMediaStream):
(ExtraData):
(WebKit::WebMediaStream::ExtraData::~ExtraData):
(WebKit::WebMediaStream::WebMediaStream):
(WebKit::WebMediaStream::~WebMediaStream):
(WebKit::WebMediaStream::operator=):
(WebKit::WebMediaStream::isNull):

  • chromium/public/WebMediaStreamCenter.h:

(WebKit):
(WebMediaStreamCenter):
(WebKit::WebMediaStreamCenter::didAddMediaStreamTrack):
(WebKit::WebMediaStreamCenter::didRemoveMediaStreamTrack):

  • chromium/public/WebMediaStreamCenterClient.h:

(WebKit):
(WebMediaStreamCenterClient):

  • chromium/public/WebMediaStreamComponent.h:
  • chromium/public/WebMediaStreamDescriptor.h:
  • chromium/public/WebMediaStreamTrack.h: Added.

(WebCore):
(WebKit):
(WebMediaStreamTrack):
(WebKit::WebMediaStreamTrack::WebMediaStreamTrack):
(WebKit::WebMediaStreamTrack::~WebMediaStreamTrack):
(WebKit::WebMediaStreamTrack::operator=):
(WebKit::WebMediaStreamTrack::isNull):

  • chromium/public/WebRTCPeerConnectionHandler.h:

(WebKit):
(WebRTCPeerConnectionHandler):

  • chromium/public/WebRTCPeerConnectionHandlerClient.h:

(WebKit):
(WebRTCPeerConnectionHandlerClient):

  • chromium/public/WebRTCStatsRequest.h:

(WebKit):
(WebRTCStatsRequest):

Source/WebCore:

Reviewed by Adam Barth.

Only renames, no other code changes.

  • WebCore.gypi:
  • platform/chromium/support/WebMediaStream.cpp: Added.

(WebKit::WebMediaStream::WebMediaStream):
(WebKit):
(WebKit::WebMediaStream::reset):
(WebKit::WebMediaStream::label):
(WebKit::WebMediaStream::id):
(WebKit::WebMediaStream::extraData):
(WebKit::WebMediaStream::setExtraData):
(WebKit::WebMediaStream::audioSources):
(WebKit::WebMediaStream::videoSources):
(WebKit::WebMediaStream::operator=):
(WebKit::WebMediaStream::operator PassRefPtr<WebCore::MediaStreamDescriptor>):
(WebKit::WebMediaStream::operator WebCore::MediaStreamDescriptor*):
(WebKit::WebMediaStream::initialize):
(WebKit::WebMediaStream::assign):

  • platform/chromium/support/WebMediaStreamComponent.cpp: Removed.
  • platform/chromium/support/WebMediaStreamDescriptor.cpp: Removed.
  • platform/chromium/support/WebMediaStreamTrack.cpp: Added.

(WebKit):
(WebKit::WebMediaStreamTrack::WebMediaStreamTrack):
(WebKit::WebMediaStreamTrack::operator=):
(WebKit::WebMediaStreamTrack::initialize):
(WebKit::WebMediaStreamTrack::reset):
(WebKit::WebMediaStreamTrack::operator PassRefPtr<MediaStreamComponent>):
(WebKit::WebMediaStreamTrack::operator MediaStreamComponent*):
(WebKit::WebMediaStreamTrack::isEnabled):
(WebKit::WebMediaStreamTrack::id):
(WebKit::WebMediaStreamTrack::stream):
(WebKit::WebMediaStreamTrack::source):
(WebKit::WebMediaStreamTrack::assign):

  • platform/chromium/support/WebRTCStatsRequest.cpp:

(WebKit::WebRTCStatsRequest::stream):
(WebKit::WebRTCStatsRequest::component):

  • platform/mediastream/chromium/MediaStreamCenterChromium.cpp:

(WebCore::MediaStreamCenterChromium::didCreateMediaStream):
(WebCore::MediaStreamCenterChromium::stopLocalMediaStream):
(WebCore::MediaStreamCenterChromium::addMediaStreamTrack):
(WebCore::MediaStreamCenterChromium::removeMediaStreamTrack):

  • platform/mediastream/chromium/MediaStreamCenterChromium.h:

(WebKit):
(MediaStreamCenterChromium):

  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:

(WebCore::RTCPeerConnectionHandlerChromium::didAddRemoteStream):
(WebCore::RTCPeerConnectionHandlerChromium::didRemoveRemoteStream):

  • platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:

(WebKit):
(RTCPeerConnectionHandlerChromium):

Source/WebKit/chromium:

Reviewed by Adam Barth.

Only renames, no other code changes.

  • public/WebMediaStreamRegistry.h:

(WebKit):
(WebMediaStreamRegistry):

  • public/WebUserMediaRequest.h:

(WebKit):
(WebUserMediaRequest):

  • src/WebMediaStreamRegistry.cpp:

(WebKit::WebMediaStreamRegistry::lookupMediaStreamDescriptor):

  • src/WebUserMediaRequest.cpp:

(WebKit::WebUserMediaRequest::requestSucceeded):

Tools:

Reviewed by Adam Barth.

Only renames, no other code changes.

  • DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp:

(MockWebMediaStreamCenter::didEnableMediaStreamTrack):
(MockWebMediaStreamCenter::didDisableMediaStreamTrack):
(MockWebMediaStreamCenter::didAddMediaStreamTrack):
(MockWebMediaStreamCenter::didRemoveMediaStreamTrack):
(MockWebMediaStreamCenter::didStopLocalMediaStream):
(MockWebMediaStreamCenter::didCreateMediaStream):

  • DumpRenderTree/chromium/MockWebMediaStreamCenter.h:

(MockWebMediaStreamCenter):

  • DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:

(MockWebRTCPeerConnectionHandler::addStream):
(MockWebRTCPeerConnectionHandler::removeStream):
(MockWebRTCPeerConnectionHandler::getStats):

  • DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h:

(MockWebRTCPeerConnectionHandler):

  • DumpRenderTree/chromium/WebUserMediaClientMock.cpp:

(UserMediaRequestTask::UserMediaRequestTask):
(WebUserMediaClientMock::requestUserMedia):

Location:
trunk
Files:
3 added
2 deleted
27 edited
1 copied

Legend:

Unmodified
Added
Removed

  • trunk/Source/Platform/ChangeLog

    r141356 r141444  
     12013-01-31  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Rename WebMediaStreamDescriptor and WebMediaStreamComponent to WebMediaStream and WebMediaStreamTrack
     4        https://bugs.webkit.org/show_bug.cgi?id=108458
     5
     6        Only renames, no other code changes.
     7
     8        Reviewed by Adam Barth.
     9
     10        * Platform.gypi:
     11        * chromium/public/WebMediaStream.h: Copied from Source/Platform/chromium/public/WebMediaStreamDescriptor.h.
     12        (WebCore):
     13        (WebKit):
     14        (WebMediaStream):
     15        (ExtraData):
     16        (WebKit::WebMediaStream::ExtraData::~ExtraData):
     17        (WebKit::WebMediaStream::WebMediaStream):
     18        (WebKit::WebMediaStream::~WebMediaStream):
     19        (WebKit::WebMediaStream::operator=):
     20        (WebKit::WebMediaStream::isNull):
     21        * chromium/public/WebMediaStreamCenter.h:
     22        (WebKit):
     23        (WebMediaStreamCenter):
     24        (WebKit::WebMediaStreamCenter::didAddMediaStreamTrack):
     25        (WebKit::WebMediaStreamCenter::didRemoveMediaStreamTrack):
     26        * chromium/public/WebMediaStreamCenterClient.h:
     27        (WebKit):
     28        (WebMediaStreamCenterClient):
     29        * chromium/public/WebMediaStreamComponent.h:
     30        * chromium/public/WebMediaStreamDescriptor.h:
     31        * chromium/public/WebMediaStreamTrack.h: Added.
     32        (WebCore):
     33        (WebKit):
     34        (WebMediaStreamTrack):
     35        (WebKit::WebMediaStreamTrack::WebMediaStreamTrack):
     36        (WebKit::WebMediaStreamTrack::~WebMediaStreamTrack):
     37        (WebKit::WebMediaStreamTrack::operator=):
     38        (WebKit::WebMediaStreamTrack::isNull):
     39        * chromium/public/WebRTCPeerConnectionHandler.h:
     40        (WebKit):
     41        (WebRTCPeerConnectionHandler):
     42        * chromium/public/WebRTCPeerConnectionHandlerClient.h:
     43        (WebKit):
     44        (WebRTCPeerConnectionHandlerClient):
     45        * chromium/public/WebRTCStatsRequest.h:
     46        (WebKit):
     47        (WebRTCStatsRequest):
     48
    1492013-01-30  Yusuf Ozuysal  <yusufo@google.com>
    250

  • trunk/Source/Platform/Platform.gypi

    r140499 r141444  
    8787            'chromium/public/WebMediaStreamCenterClient.h',
    8888            'chromium/public/WebMediaStreamComponent.h',
     89            'chromium/public/WebMediaStream.h',
    8990            'chromium/public/WebMediaStreamDescriptor.h',
    9091            'chromium/public/WebMediaStreamSource.h',
    9192            'chromium/public/WebMediaStreamSourcesRequest.h',
     93            'chromium/public/WebMediaStreamTrack.h',
    9294            'chromium/public/WebMessagePortChannel.h',
    9395            'chromium/public/WebMessagePortChannelClient.h',

  • trunk/Source/Platform/chromium/public/WebMediaStream.h

    r141443 r141444  
    11/*
    2  * Copyright (C) 2011 Google Inc. All rights reserved.
     2 * Copyright (C) 2013 Google Inc. All rights reserved.
    33 *
    44 * Redistribution and use in source and binary forms, with or without
    … …  
    2323 */
    2424
    25 #ifndef WebMediaStreamDescriptor_h
    26 #define WebMediaStreamDescriptor_h
     25#ifndef WebMediaStream_h
     26#define WebMediaStream_h
    2727
    2828#include "WebCommon.h"
    … …  
    3737namespace WebKit {
    3838
    39 class WebMediaStreamComponent;
     39class WebMediaStreamTrack;
    4040class WebMediaStreamSource;
    4141class WebString;
    4242
    43 class WebMediaStreamDescriptor {
     43class WebMediaStream {
    4444public:
    4545    class ExtraData {
    … …  
    4848    };
    4949
    50     WebMediaStreamDescriptor() { }
    51     WebMediaStreamDescriptor(const WebMediaStreamDescriptor& other) { assign(other); }
    52     ~WebMediaStreamDescriptor() { reset(); }
     50    WebMediaStream() { }
     51    WebMediaStream(const WebMediaStream& other) { assign(other); }
     52    ~WebMediaStream() { reset(); }
    5353
    54     WebMediaStreamDescriptor& operator=(const WebMediaStreamDescriptor& other)
     54    WebMediaStream& operator=(const WebMediaStream& other)
    5555    {
    5656        assign(other);
    … …  
    5858    }
    5959
    60     WEBKIT_EXPORT void assign(const WebMediaStreamDescriptor&);
     60    WEBKIT_EXPORT void assign(const WebMediaStream&);
    6161
    6262    WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
    … …  
    6969    WEBKIT_EXPORT WebString id() const;
    7070
    71     WEBKIT_EXPORT void audioSources(WebVector<WebMediaStreamComponent>&) const;
    72     WEBKIT_EXPORT void videoSources(WebVector<WebMediaStreamComponent>&) const;
     71    WEBKIT_EXPORT void audioSources(WebVector<WebMediaStreamTrack>&) const;
     72    WEBKIT_EXPORT void videoSources(WebVector<WebMediaStreamTrack>&) const;
    7373
    74     // Extra data associated with this WebMediaStreamDescriptor.
     74    // Extra data associated with this WebMediaStream.
    7575    // If non-null, the extra data pointer will be deleted when the object is destroyed.
    7676    // Setting the extra data pointer will cause any existing non-null
    … …  
    8080
    8181#if WEBKIT_IMPLEMENTATION
    82     WebMediaStreamDescriptor(WebCore::MediaStreamDescriptor*);
    83     WebMediaStreamDescriptor(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
     82    WebMediaStream(WebCore::MediaStreamDescriptor*);
     83    WebMediaStream(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
    8484    operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const;
    8585    operator WebCore::MediaStreamDescriptor*() const;
    86     WebMediaStreamDescriptor& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
     86    WebMediaStream& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
    8787#endif
    8888
    … …  
    9393} // namespace WebKit
    9494
    95 #endif // WebMediaStreamDescriptor_h
     95#endif // WebMediaStream_h

  • trunk/Source/Platform/chromium/public/WebMediaStreamCenter.h

    r134084 r141444  
    3535
    3636namespace WebKit {
    37 class WebMediaStreamComponent;
    38 class WebMediaStreamDescriptor;
     37class WebMediaStream;
    3938class WebMediaStreamSourcesRequest;
     39class WebMediaStreamTrack;
    4040
    4141class WebMediaStreamCenter {
    … …  
    4444
    4545    virtual void queryMediaStreamSources(const WebMediaStreamSourcesRequest&) = 0;
    46     virtual void didEnableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
    47     virtual void didDisableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
    48     virtual bool didAddMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) { return false; };
    49     virtual bool didRemoveMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) { return false; };
    50     virtual void didStopLocalMediaStream(const WebMediaStreamDescriptor&) = 0;
    51     virtual void didCreateMediaStream(WebMediaStreamDescriptor&) = 0;
     46    virtual void didEnableMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack&) = 0;
     47    virtual void didDisableMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack&) = 0;
     48    virtual bool didAddMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack&) { return false; };
     49    virtual bool didRemoveMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack&) { return false; };
     50    virtual void didStopLocalMediaStream(const WebMediaStream&) = 0;
     51    virtual void didCreateMediaStream(WebMediaStream&) = 0;
    5252};
    5353

  • trunk/Source/Platform/chromium/public/WebMediaStreamCenterClient.h

    r121691 r141444  
    3333
    3434namespace WebKit {
    35 
    36 class WebMediaStreamComponent;
    37 class WebMediaStreamDescriptor;
     35class WebMediaStream;
     36class WebMediaStreamTrack;
    3837
    3938class WebMediaStreamCenterClient {
    … …  
    4140    virtual ~WebMediaStreamCenterClient() { }
    4241
    43     virtual void stopLocalMediaStream(const WebMediaStreamDescriptor&) = 0;
    44     virtual void addMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
    45     virtual void removeMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&) = 0;
     42    virtual void stopLocalMediaStream(const WebMediaStream&) = 0;
     43    virtual void addMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack&) = 0;
     44    virtual void removeMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack&) = 0;
    4645};
    4746

  • trunk/Source/Platform/chromium/public/WebMediaStreamComponent.h

    r141151 r141444  
    3232#define WebMediaStreamComponent_h
    3333
    34 #include "WebCommon.h"
    35 #include "WebNonCopyable.h"
    36 #include "WebPrivatePtr.h"
     34#include <public/WebMediaStreamTrack.h>
    3735
    38 namespace WebCore {
    39 class MediaStreamComponent;
    40 }
    41 
    42 namespace WebKit {
    43 class WebMediaStreamDescriptor;
    44 class WebMediaStreamSource;
    45 class WebString;
    46 
    47 class WebMediaStreamComponent {
    48 public:
    49     WebMediaStreamComponent() { }
    50     WebMediaStreamComponent(const WebMediaStreamComponent& other) { assign(other); }
    51     ~WebMediaStreamComponent() { reset(); }
    52 
    53     WebMediaStreamComponent& operator=(const WebMediaStreamComponent& other)
    54     {
    55         assign(other);
    56         return *this;
    57     }
    58     WEBKIT_EXPORT void assign(const WebMediaStreamComponent&);
    59     WEBKIT_EXPORT void initialize(const WebMediaStreamSource&);
    60     WEBKIT_EXPORT void reset();
    61     bool isNull() const { return m_private.isNull(); }
    62 
    63     WEBKIT_EXPORT WebString id() const;
    64 
    65     WEBKIT_EXPORT WebMediaStreamDescriptor stream() const;
    66     WEBKIT_EXPORT WebMediaStreamSource source() const;
    67     WEBKIT_EXPORT bool isEnabled() const;
    68 
    69 #if WEBKIT_IMPLEMENTATION
    70     WebMediaStreamComponent(WebCore::MediaStreamComponent*);
    71     WebMediaStreamComponent& operator=(WebCore::MediaStreamComponent*);
    72     operator WTF::PassRefPtr<WebCore::MediaStreamComponent>() const;
    73     operator WebCore::MediaStreamComponent*() const;
    74 #endif
    75 
    76 private:
    77     WebPrivatePtr<WebCore::MediaStreamComponent> m_private;
    78 };
    79 
    80 } // namespace WebKit
     36// The name WebMediaStreamComponent is EXTREMELY DEPRECATED.
     37#define WebMediaStreamComponent WebMediaStreamTrack
    8138
    8239#endif // WebMediaStreamComponent_h

  • trunk/Source/Platform/chromium/public/WebMediaStreamDescriptor.h

    r139352 r141444  
    2626#define WebMediaStreamDescriptor_h
    2727
    28 #include "WebCommon.h"
    29 #include "WebNonCopyable.h"
    30 #include "WebPrivatePtr.h"
    31 #include "WebVector.h"
     28#include <public/WebMediaStream.h>
    3229
    33 namespace WebCore {
    34 class MediaStreamDescriptor;
    35 }
    36 
    37 namespace WebKit {
    38 
    39 class WebMediaStreamComponent;
    40 class WebMediaStreamSource;
    41 class WebString;
    42 
    43 class WebMediaStreamDescriptor {
    44 public:
    45     class ExtraData {
    46     public:
    47         virtual ~ExtraData() { }
    48     };
    49 
    50     WebMediaStreamDescriptor() { }
    51     WebMediaStreamDescriptor(const WebMediaStreamDescriptor& other) { assign(other); }
    52     ~WebMediaStreamDescriptor() { reset(); }
    53 
    54     WebMediaStreamDescriptor& operator=(const WebMediaStreamDescriptor& other)
    55     {
    56         assign(other);
    57         return *this;
    58     }
    59 
    60     WEBKIT_EXPORT void assign(const WebMediaStreamDescriptor&);
    61 
    62     WEBKIT_EXPORT void initialize(const WebString& label, const WebVector<WebMediaStreamSource>& audioSources, const WebVector<WebMediaStreamSource>& videoSources);
    63     WEBKIT_EXPORT void reset();
    64     bool isNull() const { return m_private.isNull(); }
    65 
    66     // DEPRECATED
    67     WEBKIT_EXPORT WebString label() const;
    68 
    69     WEBKIT_EXPORT WebString id() const;
    70 
    71     WEBKIT_EXPORT void audioSources(WebVector<WebMediaStreamComponent>&) const;
    72     WEBKIT_EXPORT void videoSources(WebVector<WebMediaStreamComponent>&) const;
    73 
    74     // Extra data associated with this WebMediaStreamDescriptor.
    75     // If non-null, the extra data pointer will be deleted when the object is destroyed.
    76     // Setting the extra data pointer will cause any existing non-null
    77     // extra data pointer to be deleted.
    78     WEBKIT_EXPORT ExtraData* extraData() const;
    79     WEBKIT_EXPORT void setExtraData(ExtraData*);
    80 
    81 #if WEBKIT_IMPLEMENTATION
    82     WebMediaStreamDescriptor(WebCore::MediaStreamDescriptor*);
    83     WebMediaStreamDescriptor(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
    84     operator WTF::PassRefPtr<WebCore::MediaStreamDescriptor>() const;
    85     operator WebCore::MediaStreamDescriptor*() const;
    86     WebMediaStreamDescriptor& operator=(const WTF::PassRefPtr<WebCore::MediaStreamDescriptor>&);
    87 #endif
    88 
    89 private:
    90     WebPrivatePtr<WebCore::MediaStreamDescriptor> m_private;
    91 };
    92 
    93 } // namespace WebKit
     30// The name WebMediaStreamDescriptor is EXTREMELY DEPRECATED.
     31#define WebMediaStreamDescriptor WebMediaStream
    9432
    9533#endif // WebMediaStreamDescriptor_h

  • trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h

    r137441 r141444  
    3434namespace WebKit {
    3535class WebMediaConstraints;
    36 class WebMediaStreamDescriptor;
     36class WebMediaStream;
    3737class WebRTCConfiguration;
    3838class WebRTCDataChannelHandler;
    … …  
    5959    virtual bool updateICE(const WebRTCConfiguration&, const WebMediaConstraints&) = 0;
    6060    virtual bool addICECandidate(const WebRTCICECandidate&) = 0;
    61     virtual bool addStream(const WebMediaStreamDescriptor&, const WebMediaConstraints&) = 0;
    62     virtual void removeStream(const WebMediaStreamDescriptor&) = 0;
     61    virtual bool addStream(const WebMediaStream&, const WebMediaConstraints&) = 0;
     62    virtual void removeStream(const WebMediaStream&) = 0;
    6363    // FIXME: Remove default implementation when clients have changed.
    6464    virtual void getStats(const WebRTCStatsRequest&) { }

  • trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h

    r140310 r141444  
    3333
    3434namespace WebKit {
    35 class WebMediaStreamDescriptor;
     35class WebMediaStream;
    3636class WebRTCDataChannelHandler;
    3737class WebRTCICECandidate;
    … …  
    7171    virtual void didChangeICEGatheringState(ICEGatheringState) { }
    7272    virtual void didChangeICEConnectionState(ICEConnectionState) { }
    73     virtual void didAddRemoteStream(const WebMediaStreamDescriptor&) = 0;
    74     virtual void didRemoveRemoteStream(const WebMediaStreamDescriptor&) = 0;
     73    virtual void didAddRemoteStream(const WebMediaStream&) = 0;
     74    virtual void didRemoveRemoteStream(const WebMediaStream&) = 0;
    7575    virtual void didAddRemoteDataChannel(WebRTCDataChannelHandler*) { }
    7676

  • trunk/Source/Platform/chromium/public/WebRTCStatsRequest.h

    r131584 r141444  
    4242namespace WebKit {
    4343
    44 class WebMediaStreamComponent;
    45 class WebMediaStreamDescriptor;
     44class WebMediaStreamTrack;
     45class WebMediaStream;
    4646class WebRTCStatsResponse;
    4747
    … …  
    8989    // required to look up a MediaStreamTrack implementation.
    9090    // It is only useful to call them when hasSelector() returns true.
    91     WEBKIT_EXPORT const WebMediaStreamDescriptor stream() const;
     91    WEBKIT_EXPORT const WebMediaStream stream() const;
    9292
    93     WEBKIT_EXPORT const WebMediaStreamComponent component() const;
     93    WEBKIT_EXPORT const WebMediaStreamTrack component() const;
    9494
    9595    WEBKIT_EXPORT void requestSucceeded(const WebRTCStatsResponse&) const;

  • trunk/Source/WebCore/ChangeLog

    r141436 r141444  
     12013-01-31  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Rename WebMediaStreamDescriptor and WebMediaStreamComponent to WebMediaStream and WebMediaStreamTrack
     4        https://bugs.webkit.org/show_bug.cgi?id=108458
     5
     6        Reviewed by Adam Barth.
     7
     8        Only renames, no other code changes.
     9
     10        * WebCore.gypi:
     11        * platform/chromium/support/WebMediaStream.cpp: Added.
     12        (WebKit::WebMediaStream::WebMediaStream):
     13        (WebKit):
     14        (WebKit::WebMediaStream::reset):
     15        (WebKit::WebMediaStream::label):
     16        (WebKit::WebMediaStream::id):
     17        (WebKit::WebMediaStream::extraData):
     18        (WebKit::WebMediaStream::setExtraData):
     19        (WebKit::WebMediaStream::audioSources):
     20        (WebKit::WebMediaStream::videoSources):
     21        (WebKit::WebMediaStream::operator=):
     22        (WebKit::WebMediaStream::operator PassRefPtr<WebCore::MediaStreamDescriptor>):
     23        (WebKit::WebMediaStream::operator WebCore::MediaStreamDescriptor*):
     24        (WebKit::WebMediaStream::initialize):
     25        (WebKit::WebMediaStream::assign):
     26        * platform/chromium/support/WebMediaStreamComponent.cpp: Removed.
     27        * platform/chromium/support/WebMediaStreamDescriptor.cpp: Removed.
     28        * platform/chromium/support/WebMediaStreamTrack.cpp: Added.
     29        (WebKit):
     30        (WebKit::WebMediaStreamTrack::WebMediaStreamTrack):
     31        (WebKit::WebMediaStreamTrack::operator=):
     32        (WebKit::WebMediaStreamTrack::initialize):
     33        (WebKit::WebMediaStreamTrack::reset):
     34        (WebKit::WebMediaStreamTrack::operator PassRefPtr<MediaStreamComponent>):
     35        (WebKit::WebMediaStreamTrack::operator MediaStreamComponent*):
     36        (WebKit::WebMediaStreamTrack::isEnabled):
     37        (WebKit::WebMediaStreamTrack::id):
     38        (WebKit::WebMediaStreamTrack::stream):
     39        (WebKit::WebMediaStreamTrack::source):
     40        (WebKit::WebMediaStreamTrack::assign):
     41        * platform/chromium/support/WebRTCStatsRequest.cpp:
     42        (WebKit::WebRTCStatsRequest::stream):
     43        (WebKit::WebRTCStatsRequest::component):
     44        * platform/mediastream/chromium/MediaStreamCenterChromium.cpp:
     45        (WebCore::MediaStreamCenterChromium::didCreateMediaStream):
     46        (WebCore::MediaStreamCenterChromium::stopLocalMediaStream):
     47        (WebCore::MediaStreamCenterChromium::addMediaStreamTrack):
     48        (WebCore::MediaStreamCenterChromium::removeMediaStreamTrack):
     49        * platform/mediastream/chromium/MediaStreamCenterChromium.h:
     50        (WebKit):
     51        (MediaStreamCenterChromium):
     52        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp:
     53        (WebCore::RTCPeerConnectionHandlerChromium::didAddRemoteStream):
     54        (WebCore::RTCPeerConnectionHandlerChromium::didRemoveRemoteStream):
     55        * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h:
     56        (WebKit):
     57        (RTCPeerConnectionHandlerChromium):
     58
    1592013-01-31  Dmitry Zvorygin  <zvorygin@chromium.org>
    260

  • trunk/Source/WebCore/WebCore.gypi

    r141382 r141444  
    72037203            'platform/chromium/support/WebHTTPLoadInfo.cpp',
    72047204            'platform/chromium/support/WebMediaConstraints.cpp',
    7205             'platform/chromium/support/WebMediaStreamComponent.cpp',
    7206             'platform/chromium/support/WebMediaStreamDescriptor.cpp',
     7205            'platform/chromium/support/WebMediaStream.cpp',
    72077206            'platform/chromium/support/WebMediaStreamSource.cpp',
    72087207            'platform/chromium/support/WebMediaStreamSourcesRequest.cpp',
     7208            'platform/chromium/support/WebMediaStreamTrack.cpp',
    72097209            'platform/chromium/support/WebPrerender.cpp',
    72107210            'platform/chromium/support/WebRTCConfiguration.cpp',

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

    r131584 r141444  
    1 
    21/*
    32 * Copyright (C) 2012 Google Inc. All rights reserved.
    … …  
    3433#if ENABLE(MEDIA_STREAM)
    3534
    36 #include <public/WebMediaStreamComponent.h>
    37 #include <public/WebMediaStreamDescriptor.h>
    3835#include <public/WebRTCStatsRequest.h>
    39 #include <public/WebRTCStatsResponse.h>
    4036
    4137#include "RTCStatsRequest.h"
    4238#include "RTCStatsResponse.h"
     39#include <public/WebMediaStream.h>
     40#include <public/WebMediaStreamTrack.h>
     41#include <public/WebRTCStatsResponse.h>
    4342#include <wtf/PassOwnPtr.h>
    4443
    … …  
    7271}
    7372
    74 const WebMediaStreamDescriptor WebRTCStatsRequest::stream() const
     73const WebMediaStream WebRTCStatsRequest::stream() const
    7574{
    76     return WebMediaStreamDescriptor(m_private->stream());
     75    return WebMediaStream(m_private->stream());
    7776}
    7877
    79 const WebMediaStreamComponent WebRTCStatsRequest::component() const
     78const WebMediaStreamTrack WebRTCStatsRequest::component() const
    8079{
    81     return WebMediaStreamComponent(m_private->component());
     80    return WebMediaStreamTrack(m_private->component());
    8281}
    8382

  • trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.cpp

    r134084 r141444  
    3838#include "MediaStreamSourcesQueryClient.h"
    3939#include <public/Platform.h>
     40#include <public/WebMediaStream.h>
    4041#include <public/WebMediaStreamCenter.h>
    41 #include <public/WebMediaStreamComponent.h>
    42 #include <public/WebMediaStreamDescriptor.h>
    4342#include <public/WebMediaStreamSourcesRequest.h>
     43#include <public/WebMediaStreamTrack.h>
    4444#include <wtf/MainThread.h>
    4545#include <wtf/PassOwnPtr.h>
    … …  
    102102{
    103103    if (m_private) {
    104         WebKit::WebMediaStreamDescriptor webStream(stream);
     104        WebKit::WebMediaStream webStream(stream);
    105105        m_private->didCreateMediaStream(webStream);
    106106    }
    107107}
    108108
    109 void MediaStreamCenterChromium::stopLocalMediaStream(const WebKit::WebMediaStreamDescriptor& stream)
     109void MediaStreamCenterChromium::stopLocalMediaStream(const WebKit::WebMediaStream& stream)
    110110{
    111111    endLocalMediaStream(stream);
    112112}
    113113
    114 void MediaStreamCenterChromium::addMediaStreamTrack(const WebKit::WebMediaStreamDescriptor& stream, const WebKit::WebMediaStreamComponent& component)
     114void MediaStreamCenterChromium::addMediaStreamTrack(const WebKit::WebMediaStream& stream, const WebKit::WebMediaStreamTrack& component)
    115115{
    116116    MediaStreamCenter::addMediaStreamTrack(stream, component);
    117117}
    118118
    119 void MediaStreamCenterChromium::removeMediaStreamTrack(const WebKit::WebMediaStreamDescriptor& stream, const WebKit::WebMediaStreamComponent& component)
     119void MediaStreamCenterChromium::removeMediaStreamTrack(const WebKit::WebMediaStream& stream, const WebKit::WebMediaStreamTrack& component)
    120120{
    121121    MediaStreamCenter::removeMediaStreamTrack(stream, component);

  • trunk/Source/WebCore/platform/mediastream/chromium/MediaStreamCenterChromium.h

    r134084 r141444  
    4242
    4343namespace WebKit {
     44class WebMediaStream;
    4445class WebMediaStreamCenter;
    45 class WebMediaStreamComponent;
    46 class WebMediaStreamDescriptor;
     46class WebMediaStreamTrack;
    4747}
    4848
    … …  
    6767
    6868    // WebKit::WebMediaStreamCenterClient
    69     virtual void stopLocalMediaStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
    70     virtual void addMediaStreamTrack(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaStreamComponent&) OVERRIDE;
    71     virtual void removeMediaStreamTrack(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaStreamComponent&) OVERRIDE;
     69    virtual void stopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE;
     70    virtual void addMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
     71    virtual void removeMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
    7272
    7373private:

  • trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp

    r140310 r141444  
    4747#include <public/Platform.h>
    4848#include <public/WebMediaConstraints.h>
    49 #include <public/WebMediaStreamDescriptor.h>
     49#include <public/WebMediaStream.h>
    5050#include <public/WebRTCConfiguration.h>
    5151#include <public/WebRTCDataChannelHandler.h>
    … …  
    189189}
    190190
    191 void RTCPeerConnectionHandlerChromium::didAddRemoteStream(const WebKit::WebMediaStreamDescriptor& webMediaStreamDescriptor)
     191void RTCPeerConnectionHandlerChromium::didAddRemoteStream(const WebKit::WebMediaStream& webMediaStreamDescriptor)
    192192{
    193193    m_client->didAddRemoteStream(webMediaStreamDescriptor);
    194194}
    195195
    196 void RTCPeerConnectionHandlerChromium::didRemoveRemoteStream(const WebKit::WebMediaStreamDescriptor& webMediaStreamDescriptor)
     196void RTCPeerConnectionHandlerChromium::didRemoveRemoteStream(const WebKit::WebMediaStream& webMediaStreamDescriptor)
    197197{
    198198    m_client->didRemoveRemoteStream(webMediaStreamDescriptor);

  • trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h

    r140310 r141444  
    4242
    4343namespace WebKit {
    44 class WebMediaStreamDescriptor;
     44class WebMediaStream;
    4545class WebRTCICECandidate;
    4646}
    … …  
    7979    virtual void didChangeICEGatheringState(WebKit::WebRTCPeerConnectionHandlerClient::ICEGatheringState) OVERRIDE;
    8080    virtual void didChangeICEConnectionState(WebKit::WebRTCPeerConnectionHandlerClient::ICEConnectionState) OVERRIDE;
    81     virtual void didAddRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
    82     virtual void didRemoveRemoteStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
     81    virtual void didAddRemoteStream(const WebKit::WebMediaStream&) OVERRIDE;
     82    virtual void didRemoveRemoteStream(const WebKit::WebMediaStream&) OVERRIDE;
    8383    virtual void didAddRemoteDataChannel(WebKit::WebRTCDataChannelHandler*) OVERRIDE;
    8484

  • trunk/Source/WebKit/chromium/ChangeLog

    r141438 r141444  
     12013-01-31  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Rename WebMediaStreamDescriptor and WebMediaStreamComponent to WebMediaStream and WebMediaStreamTrack
     4        https://bugs.webkit.org/show_bug.cgi?id=108458
     5
     6        Reviewed by Adam Barth.
     7
     8        Only renames, no other code changes.
     9
     10        * public/WebMediaStreamRegistry.h:
     11        (WebKit):
     12        (WebMediaStreamRegistry):
     13        * public/WebUserMediaRequest.h:
     14        (WebKit):
     15        (WebUserMediaRequest):
     16        * src/WebMediaStreamRegistry.cpp:
     17        (WebKit::WebMediaStreamRegistry::lookupMediaStreamDescriptor):
     18        * src/WebUserMediaRequest.cpp:
     19        (WebKit::WebUserMediaRequest::requestSucceeded):
     20
    1212013-01-31  Alec Flett  <alecflett@chromium.org>
    222

  • trunk/Source/WebKit/chromium/public/WebMediaStreamRegistry.h

    r140621 r141444  
    3636namespace WebKit {
    3737
    38 class WebMediaStreamDescriptor;
     38class WebMediaStream;
    3939class WebURL;
    4040
    4141class WebMediaStreamRegistry {
    4242public:
    43     WEBKIT_EXPORT static WebMediaStreamDescriptor lookupMediaStreamDescriptor(const WebURL&);
     43    WEBKIT_EXPORT static WebMediaStream lookupMediaStreamDescriptor(const WebURL&);
    4444};
    4545

  • trunk/Source/WebKit/chromium/public/WebUserMediaRequest.h

    r140621 r141444  
    4343class WebDocument;
    4444class WebMediaConstraints;
    45 class WebMediaStreamDescriptor;
     45class WebMediaStream;
    4646class WebMediaStreamSource;
    4747class WebString;
    … …  
    7373    WEBKIT_EXPORT WebDocument ownerDocument() const;
    7474
    75     WEBKIT_EXPORT void requestSucceeded(const WebMediaStreamDescriptor&);
     75    WEBKIT_EXPORT void requestSucceeded(const WebMediaStream&);
    7676
    7777    WEBKIT_EXPORT void requestFailed();

  • trunk/Source/WebKit/chromium/src/WebMediaStreamRegistry.cpp

    r130530 r141444  
    3838#include "MediaStreamDescriptor.h"
    3939#include "MediaStreamRegistry.h"
    40 #include <public/WebMediaStreamDescriptor.h>
     40#include <public/WebMediaStream.h>
    4141#include <public/WebString.h>
    4242#include <public/WebURL.h>
    … …  
    4646namespace WebKit {
    4747
    48 WebMediaStreamDescriptor WebMediaStreamRegistry::lookupMediaStreamDescriptor(const WebURL& url)
     48WebMediaStream WebMediaStreamRegistry::lookupMediaStreamDescriptor(const WebURL& url)
    4949{
    50     return WebMediaStreamDescriptor(MediaStreamRegistry::registry().lookupMediaStreamDescriptor(KURL(url).string()));
     50    return WebMediaStream(MediaStreamRegistry::registry().lookupMediaStreamDescriptor(KURL(url).string()));
    5151}
    5252

  • trunk/Source/WebKit/chromium/src/WebUserMediaRequest.cpp

    r129749 r141444  
    4444#include "WebSecurityOrigin.h"
    4545#include <public/WebMediaConstraints.h>
    46 #include <public/WebMediaStreamDescriptor.h>
     46#include <public/WebMediaStream.h>
    4747#include <public/WebMediaStreamSource.h>
    4848#include <public/WebString.h>
    … …  
    100100}
    101101
    102 void WebUserMediaRequest::requestSucceeded(const WebMediaStreamDescriptor& streamDescriptor)
     102void WebUserMediaRequest::requestSucceeded(const WebMediaStream& streamDescriptor)
    103103{
    104104    ASSERT(!isNull() && !streamDescriptor.isNull());

  • trunk/Tools/ChangeLog

    r141441 r141444  
     12013-01-31  Tommy Widenflycht  <tommyw@google.com>
     2
     3        [chromium] MediaStream API: Rename WebMediaStreamDescriptor and WebMediaStreamComponent to WebMediaStream and WebMediaStreamTrack
     4        https://bugs.webkit.org/show_bug.cgi?id=108458
     5
     6        Reviewed by Adam Barth.
     7
     8        Only renames, no other code changes.
     9
     10        * DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp:
     11        (MockWebMediaStreamCenter::didEnableMediaStreamTrack):
     12        (MockWebMediaStreamCenter::didDisableMediaStreamTrack):
     13        (MockWebMediaStreamCenter::didAddMediaStreamTrack):
     14        (MockWebMediaStreamCenter::didRemoveMediaStreamTrack):
     15        (MockWebMediaStreamCenter::didStopLocalMediaStream):
     16        (MockWebMediaStreamCenter::didCreateMediaStream):
     17        * DumpRenderTree/chromium/MockWebMediaStreamCenter.h:
     18        (MockWebMediaStreamCenter):
     19        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp:
     20        (MockWebRTCPeerConnectionHandler::addStream):
     21        (MockWebRTCPeerConnectionHandler::removeStream):
     22        (MockWebRTCPeerConnectionHandler::getStats):
     23        * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h:
     24        (MockWebRTCPeerConnectionHandler):
     25        * DumpRenderTree/chromium/WebUserMediaClientMock.cpp:
     26        (UserMediaRequestTask::UserMediaRequestTask):
     27        (WebUserMediaClientMock::requestUserMedia):
     28
    1292013-01-31  Zan Dobersek  <zdobersek@igalia.com>
    230

  • trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.cpp

    r138895 r141444  
    3535
    3636#include <public/WebAudioDestinationConsumer.h>
     37#include <public/WebMediaStream.h>
    3738#include <public/WebMediaStreamCenterClient.h>
    38 #include <public/WebMediaStreamComponent.h>
    39 #include <public/WebMediaStreamDescriptor.h>
    4039#include <public/WebMediaStreamSource.h>
    4140#include <public/WebMediaStreamSourcesRequest.h>
     41#include <public/WebMediaStreamTrack.h>
    4242#include <public/WebVector.h>
    4343
    … …  
    5454}
    5555
    56 void MockWebMediaStreamCenter::didEnableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent& component)
     56void MockWebMediaStreamCenter::didEnableMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack& component)
    5757{
    5858    component.source().setReadyState(WebMediaStreamSource::ReadyStateLive);
    5959}
    6060
    61 void MockWebMediaStreamCenter::didDisableMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent& component)
     61void MockWebMediaStreamCenter::didDisableMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack& component)
    6262{
    6363    component.source().setReadyState(WebMediaStreamSource::ReadyStateMuted);
    6464}
    6565
    66 bool MockWebMediaStreamCenter::didAddMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&)
     66bool MockWebMediaStreamCenter::didAddMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack&)
    6767{
    6868    return true;
    6969};
    7070
    71 bool MockWebMediaStreamCenter::didRemoveMediaStreamTrack(const WebMediaStreamDescriptor&, const WebMediaStreamComponent&)
     71bool MockWebMediaStreamCenter::didRemoveMediaStreamTrack(const WebMediaStream&, const WebMediaStreamTrack&)
    7272{
    7373    return true;
    7474};
    7575
    76 void MockWebMediaStreamCenter::didStopLocalMediaStream(const WebMediaStreamDescriptor& stream)
     76void MockWebMediaStreamCenter::didStopLocalMediaStream(const WebMediaStream& stream)
    7777{
    78     WebVector<WebMediaStreamComponent> audioComponents;
     78    WebVector<WebMediaStreamTrack> audioComponents;
    7979    stream.audioSources(audioComponents);
    8080    for (size_t i = 0; i < audioComponents.size(); ++i)
    8181        audioComponents[i].source().setReadyState(WebMediaStreamSource::ReadyStateEnded);
    8282
    83     WebVector<WebMediaStreamComponent> videoComponents;
     83    WebVector<WebMediaStreamTrack> videoComponents;
    8484    stream.videoSources(videoComponents);
    8585    for (size_t i = 0; i < videoComponents.size(); ++i)
    … …  
    9494};
    9595
    96 void MockWebMediaStreamCenter::didCreateMediaStream(WebMediaStreamDescriptor& stream)
     96void MockWebMediaStreamCenter::didCreateMediaStream(WebMediaStream& stream)
    9797{
    98     WebVector<WebMediaStreamComponent> audioComponents;
     98    WebVector<WebMediaStreamTrack> audioComponents;
    9999    stream.audioSources(audioComponents);
    100100    for (size_t i = 0; i < audioComponents.size(); ++i) {

  • trunk/Tools/DumpRenderTree/chromium/MockWebMediaStreamCenter.h

    r134084 r141444  
    4444
    4545    virtual void queryMediaStreamSources(const WebKit::WebMediaStreamSourcesRequest&) OVERRIDE;
    46     virtual void didEnableMediaStreamTrack(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaStreamComponent&) OVERRIDE;
    47     virtual void didDisableMediaStreamTrack(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaStreamComponent&) OVERRIDE;
    48     virtual bool didAddMediaStreamTrack(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaStreamComponent&) OVERRIDE;
    49     virtual bool didRemoveMediaStreamTrack(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaStreamComponent&) OVERRIDE;
    50     virtual void didStopLocalMediaStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
    51     virtual void didCreateMediaStream(WebKit::WebMediaStreamDescriptor&) OVERRIDE;
     46    virtual void didEnableMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
     47    virtual void didDisableMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
     48    virtual bool didAddMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
     49    virtual bool didRemoveMediaStreamTrack(const WebKit::WebMediaStream&, const WebKit::WebMediaStreamTrack&) OVERRIDE;
     50    virtual void didStopLocalMediaStream(const WebKit::WebMediaStream&) OVERRIDE;
     51    virtual void didCreateMediaStream(WebKit::WebMediaStream&) OVERRIDE;
    5252
    5353private:

  • trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp

    r140310 r141444  
    3838#include "Task.h"
    3939#include <public/WebMediaConstraints.h>
    40 #include <public/WebMediaStreamComponent.h>
    41 #include <public/WebMediaStreamDescriptor.h>
     40#include <public/WebMediaStream.h>
     41#include <public/WebMediaStreamTrack.h>
    4242#include <public/WebRTCPeerConnectionHandlerClient.h>
    4343#include <public/WebRTCSessionDescription.h>
    … …  
    249249}
    250250
    251 bool MockWebRTCPeerConnectionHandler::addStream(const WebMediaStreamDescriptor& stream, const WebMediaConstraints&)
     251bool MockWebRTCPeerConnectionHandler::addStream(const WebMediaStream& stream, const WebMediaConstraints&)
    252252{
    253253    m_streamCount += 1;
    … …  
    257257}
    258258
    259 void MockWebRTCPeerConnectionHandler::removeStream(const WebMediaStreamDescriptor& stream)
     259void MockWebRTCPeerConnectionHandler::removeStream(const WebMediaStream& stream)
    260260{
    261261    m_streamCount -= 1;
    … …  
    269269    double currentDate = WTF::jsCurrentTime();
    270270    if (request.hasSelector()) {
    271         WebMediaStreamDescriptor stream = request.stream();
    272         WebMediaStreamComponent component = request.component();
     271        WebMediaStream stream = request.stream();
    273272        // FIXME: There is no check that the fetched values are valid.
    274273        size_t reportIndex = response.addReport();

  • trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h

    r137441 r141444  
    5858    virtual bool updateICE(const WebKit::WebRTCConfiguration&, const WebKit::WebMediaConstraints&) OVERRIDE;
    5959    virtual bool addICECandidate(const WebKit::WebRTCICECandidate&) OVERRIDE;
    60     virtual bool addStream(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaConstraints&) OVERRIDE;
    61     virtual void removeStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE;
     60    virtual bool addStream(const WebKit::WebMediaStream&, const WebKit::WebMediaConstraints&) OVERRIDE;
     61    virtual void removeStream(const WebKit::WebMediaStream&) OVERRIDE;
    6262    virtual void getStats(const WebKit::WebRTCStatsRequest&) OVERRIDE;
    6363    virtual WebKit::WebRTCDataChannelHandler* createDataChannel(const WebKit::WebString& label, bool reliable) OVERRIDE;

  • trunk/Tools/DumpRenderTree/chromium/WebUserMediaClientMock.cpp

    r132138 r141444  
    4040#include "WebUserMediaRequest.h"
    4141#include <public/WebMediaConstraints.h>
    42 #include <public/WebMediaStreamDescriptor.h>
     42#include <public/WebMediaStream.h>
    4343#include <public/WebMediaStreamSource.h>
    4444#include <public/WebVector.h>
    … …  
    5050class UserMediaRequestTask : public WebMethodTask<WebUserMediaClientMock> {
    5151public:
    52     UserMediaRequestTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request, const WebMediaStreamDescriptor result)
     52    UserMediaRequestTask(WebUserMediaClientMock* object, const WebUserMediaRequest& request, const WebMediaStream result)
    5353        : WebMethodTask<WebUserMediaClientMock>(object)
    5454        , m_request(request)
    … …  
    6767private:
    6868    WebUserMediaRequest m_request;
    69     WebMediaStreamDescriptor m_result;
     69    WebMediaStream m_result;
    7070};
    7171
    7272////////////////////////////////
    7373
    74 class MockExtraData : public WebMediaStreamDescriptor::ExtraData {
     74class MockExtraData : public WebMediaStream::ExtraData {
    7575public:
    7676    int foo;
    … …  
    8888
    8989    if (request.ownerDocument().isNull() || !request.ownerDocument().frame()) {
    90         postTask(new UserMediaRequestTask(this, request, WebMediaStreamDescriptor()));
     90        postTask(new UserMediaRequestTask(this, request, WebMediaStream()));
    9191        return;
    9292    }
    … …  
    9494    WebMediaConstraints constraints = request.audioConstraints();
    9595    if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints)) {
    96         postTask(new UserMediaRequestTask(this, request, WebMediaStreamDescriptor()));
     96        postTask(new UserMediaRequestTask(this, request, WebMediaStream()));
    9797        return;
    9898    }
    9999    constraints = request.videoConstraints();
    100100    if (!constraints.isNull() && !MockConstraints::verifyConstraints(constraints)) {
    101         postTask(new UserMediaRequestTask(this, request, WebMediaStreamDescriptor()));
     101        postTask(new UserMediaRequestTask(this, request, WebMediaStream()));
    102102        return;
    103103    }
    … …  
    114114        videoSources[0].initialize("MockVideoDevice#1", WebMediaStreamSource::TypeVideo, "Mock video device");
    115115
    116     WebMediaStreamDescriptor stream;
     116    WebMediaStream stream;
    117117    stream.initialize("foobar", audioSources, videoSources);
    118118
Note: See TracChangeset for help on using the changeset viewer.