Changeset 129908 in webkit
- Timestamp:
- Sep 28, 2012 9:25:45 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 16 added
- 17 edited
- 2 copied
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r129905 r129908 1 2012-09-28 Harald Tveit Alvestrand <harald@alvestrand.no> 2 3 Implement the GetStats interface on PeerConnection 4 https://bugs.webkit.org/show_bug.cgi?id=95193 5 6 Reviewed by Adam Barth. 7 8 * fast/mediastream/RTCPeerConnection-stats-expected.txt: Added. 9 * fast/mediastream/RTCPeerConnection-stats.html: Added. 10 1 11 2012-09-28 Stephen Chenney <schenney@chromium.org> 2 12 -
trunk/Source/Platform/ChangeLog
r129894 r129908 1 2012-09-28 Harald Tveit Alvestrand <harald@alvestrand.no> 2 3 Implement the GetStats interface on PeerConnection 4 https://bugs.webkit.org/show_bug.cgi?id=95193 5 6 Reviewed by Adam Barth. 7 8 * chromium/public/WebRTCPeerConnectionHandler.h: 9 (WebKit): 10 (WebRTCPeerConnectionHandler): 11 (WebKit::WebRTCPeerConnectionHandler::getStats): 12 * chromium/public/WebRTCStatsRequest.h: added. 13 (WebCore): 14 (WebKit): 15 (WebRTCStatsRequest): 16 (WebKit::WebRTCStatsRequest::WebRTCStatsRequest): 17 (WebKit::WebRTCStatsRequest::~WebRTCStatsRequest): 18 (WebKit::WebRTCStatsRequest::operator=): 19 1 20 2012-09-28 Kentaro Hara <haraken@chromium.org> 2 21 -
trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h
r129672 r129908 40 40 class WebRTCSessionDescription; 41 41 class WebRTCSessionDescriptionRequest; 42 class WebRTCStatsRequest; 42 43 class WebRTCVoidRequest; 43 44 … … 58 59 virtual bool addStream(const WebMediaStreamDescriptor&, const WebMediaConstraints&) = 0; 59 60 virtual void removeStream(const WebMediaStreamDescriptor&) = 0; 61 // FIXME: Remove default implementation when clients have changed. 62 virtual void getStats(const WebRTCStatsRequest&) { } 60 63 virtual void stop() = 0; 61 64 }; -
trunk/Source/Platform/chromium/public/WebRTCStatsRequest.h
r129907 r129908 29 29 */ 30 30 31 #ifndef WebRTCPeerConnectionHandler_h 32 #define WebRTCPeerConnectionHandler_h 31 #ifndef WebRTCStatsRequest_h 32 #define WebRTCStatsRequest_h 33 34 #include "WebCommon.h" 35 #include "WebPrivatePtr.h" 36 #include "WebString.h" 37 38 namespace WebCore { 39 class RTCStatsRequest; 40 } 33 41 34 42 namespace WebKit { 35 class WebMediaConstraints;36 class WebMediaStreamDescriptor;37 class WebRTCConfiguration;38 class WebRTCICECandidate;39 class WebRTCPeerConnectionHandlerClient;40 class WebRTCSessionDescription;41 class WebRTCSessionDescriptionRequest;42 class WebRTCVoidRequest;43 43 44 class WebRTC PeerConnectionHandler{44 class WebRTCStatsRequest { 45 45 public: 46 virtual ~WebRTCPeerConnectionHandler() { } 46 WebRTCStatsRequest() { } 47 WebRTCStatsRequest(const WebRTCStatsRequest& other) { assign(other); } 48 ~WebRTCStatsRequest() { reset(); } 47 49 48 virtual bool initialize(const WebRTCConfiguration&, const WebMediaConstraints&) = 0; 50 WebRTCStatsRequest& operator=(const WebRTCStatsRequest& other) 51 { 52 assign(other); 53 return *this; 54 } 49 55 50 virtual void createOffer(const WebRTCSessionDescriptionRequest&, const WebMediaConstraints&) = 0; 51 virtual void createAnswer(const WebRTCSessionDescriptionRequest&, const WebMediaConstraints&) = 0; 52 virtual void setLocalDescription(const WebRTCVoidRequest&, const WebRTCSessionDescription&) = 0; 53 virtual void setRemoteDescription(const WebRTCVoidRequest&, const WebRTCSessionDescription&) = 0; 54 virtual WebRTCSessionDescription localDescription() = 0; 55 virtual WebRTCSessionDescription remoteDescription() = 0; 56 virtual bool updateICE(const WebRTCConfiguration&, const WebMediaConstraints&) = 0; 57 virtual bool addICECandidate(const WebRTCICECandidate&) = 0; 58 virtual bool addStream(const WebMediaStreamDescriptor&, const WebMediaConstraints&) = 0; 59 virtual void removeStream(const WebMediaStreamDescriptor&) = 0; 60 virtual void stop() = 0; 56 WEBKIT_EXPORT void assign(const WebRTCStatsRequest&); 57 58 WEBKIT_EXPORT void reset(); 59 60 WEBKIT_EXPORT void requestSucceeded() const; 61 62 #if WEBKIT_IMPLEMENTATION 63 WebRTCStatsRequest(const WTF::PassRefPtr<WebCore::RTCStatsRequest>&); 64 #endif 65 66 private: 67 WebPrivatePtr<WebCore::RTCStatsRequest> m_private; 61 68 }; 62 69 63 70 } // namespace WebKit 64 71 65 #endif // WebRTC PeerConnectionHandler_h72 #endif // WebRTCStatsRequest_h -
trunk/Source/WebCore/CMakeLists.txt
r129876 r129908 229 229 Modules/mediastream/RTCSessionDescription.idl 230 230 Modules/mediastream/RTCSessionDescriptionCallback.idl 231 Modules/mediastream/RTCStatsCallback.idl 232 Modules/mediastream/RTCStatsElement.idl 233 Modules/mediastream/RTCStatsReport.idl 234 Modules/mediastream/RTCStatsResponse.idl 231 235 Modules/mediastream/SessionDescription.idl 232 236 … … 862 866 Modules/mediastream/RTCSessionDescription.cpp 863 867 Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp 868 Modules/mediastream/RTCStatsElement.cpp 869 Modules/mediastream/RTCStatsReport.cpp 870 Modules/mediastream/RTCStatsRequestImpl.cpp 871 Modules/mediastream/RTCStatsResponse.cpp 864 872 Modules/mediastream/RTCVoidRequestImpl.cpp 865 873 Modules/mediastream/SessionDescription.cpp -
trunk/Source/WebCore/ChangeLog
r129907 r129908 1 2012-09-28 Harald Tveit Alvestrand <harald@alvestrand.no> 2 3 Implement the GetStats interface on PeerConnection 4 https://bugs.webkit.org/show_bug.cgi?id=95193 5 6 Specification: 7 http://dev.w3.org/2011/webrtc/editor/webrtc-20120920.html 8 9 Reviewed by Adam Barth. 10 11 The implementation consists of a pure virtual platform object 12 (RTCStatsRequest) that is implemented in WebCore, and stores 13 its information in a straightforward data hierarchy. 14 This patch adds the call path and the storage structures. 15 It does not add filling in data. 16 17 Test: fast/mediastream/RTCPeerConnection-stats.html 18 19 * CMakeLists.txt: 20 * Modules/mediastream/RTCPeerConnection.cpp: 21 (WebCore::RTCPeerConnection::getStats): 22 (WebCore): 23 * Modules/mediastream/RTCPeerConnection.h: 24 (WebCore): 25 (RTCPeerConnection): 26 * Modules/mediastream/RTCPeerConnection.idl: 27 * Modules/mediastream/RTCStatsCallback.h: Added. 28 (WebCore): 29 (RTCStatsCallback): 30 (WebCore::RTCStatsCallback::~RTCStatsCallback): 31 * Modules/mediastream/RTCStatsCallback.idl: Added. 32 * Modules/mediastream/RTCStatsElement.cpp: Added. 33 (WebCore): 34 (WebCore::RTCStatsElement::create): 35 (WebCore::RTCStatsElement::RTCStatsElement): 36 (WebCore::RTCStatsElement::stat): 37 * Modules/mediastream/RTCStatsElement.h: Added. 38 (WebCore): 39 (RTCStatsElement): 40 * Modules/mediastream/RTCStatsElement.idl: Added. 41 * Modules/mediastream/RTCStatsReport.cpp: Added. 42 (WebCore): 43 (WebCore::RTCStatsReport::create): 44 (WebCore::RTCStatsReport::RTCStatsReport): 45 * Modules/mediastream/RTCStatsReport.h: Added. 46 (WebCore): 47 (RTCStatsReport): 48 (WebCore::RTCStatsReport::local): 49 (WebCore::RTCStatsReport::remote): 50 * Modules/mediastream/RTCStatsReport.idl: Added. 51 * Modules/mediastream/RTCStatsRequestImpl.cpp: Added. 52 (WebCore): 53 (WebCore::RTCStatsRequestImpl::create): 54 (WebCore::RTCStatsRequestImpl::RTCStatsRequestImpl): 55 (WebCore::RTCStatsRequestImpl::~RTCStatsRequestImpl): 56 (WebCore::RTCStatsRequestImpl::requestSucceeded): 57 (WebCore::RTCStatsRequestImpl::stop): 58 (WebCore::RTCStatsRequestImpl::clear): 59 * Modules/mediastream/RTCStatsRequestImpl.h: Added. 60 (WebCore): 61 (RTCStatsRequestImpl): 62 * Modules/mediastream/RTCStatsResponse.cpp: Added. 63 (WebCore): 64 (WebCore::RTCStatsResponse::create): 65 (WebCore::RTCStatsResponse::RTCStatsResponse): 66 * Modules/mediastream/RTCStatsResponse.h: Added. 67 (WebCore): 68 (RTCStatsResponse): 69 (WebCore::RTCStatsResponse::result): 70 * Modules/mediastream/RTCStatsResponse.idl: Added. 71 * WebCore.gypi: 72 * platform/chromium/support/WebRTCStatsRequest.cpp: Copied from Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h. 73 (WebKit): 74 (WebKit::WebRTCStatsRequest::WebRTCStatsRequest): 75 (WebKit::WebRTCStatsRequest::assign): 76 (WebKit::WebRTCStatsRequest::reset): 77 (WebKit::WebRTCStatsRequest::requestSucceeded): 78 * platform/mediastream/RTCPeerConnectionHandler.h: 79 (WebCore): 80 (RTCPeerConnectionHandler): 81 * platform/mediastream/RTCStatsRequest.h: Copied from Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h. 82 (WebCore): 83 (RTCStatsRequest): 84 (WebCore::RTCStatsRequest::~RTCStatsRequest): 85 (WebCore::RTCStatsRequest::RTCStatsRequest): 86 * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp: 87 (WebCore::RTCPeerConnectionHandlerChromium::getStats): 88 (WebCore): 89 * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h: 90 (RTCPeerConnectionHandlerChromium): 91 1 92 2012-09-28 Andreas Kling <kling@webkit.org> 2 93 -
trunk/Source/WebCore/GNUmakefile.list.am
r129876 r129908 640 640 DerivedSources/WebCore/JSRTCSessionDescriptionCallback.cpp \ 641 641 DerivedSources/WebCore/JSRTCSessionDescriptionCallback.h \ 642 DerivedSources/WebCore/JSRTCStatsCallback.cpp \ 643 DerivedSources/WebCore/JSRTCStatsCallback.h \ 644 DerivedSources/WebCore/JSRTCStatsElement.cpp \ 645 DerivedSources/WebCore/JSRTCStatsElement.h \ 646 DerivedSources/WebCore/JSRTCStatsReport.cpp \ 647 DerivedSources/WebCore/JSRTCStatsReport.h \ 648 DerivedSources/WebCore/JSRTCStatsResponse.cpp \ 649 DerivedSources/WebCore/JSRTCStatsResponse.h \ 642 650 DerivedSources/WebCore/JSScreen.cpp \ 643 651 DerivedSources/WebCore/JSScreen.h \ … … 1237 1245 $(WebCore)/Modules/mediastream/RTCSessionDescription.idl \ 1238 1246 $(WebCore)/Modules/mediastream/RTCSessionDescriptionCallback.idl \ 1247 $(WebCore)/Modules/mediastream/RTCStatsCallback.idl \ 1248 $(WebCore)/Modules/mediastream/RTCStatsElement.idl \ 1249 $(WebCore)/Modules/mediastream/RTCStatsReport.idl \ 1250 $(WebCore)/Modules/mediastream/RTCStatsResponse.idl \ 1239 1251 $(WebCore)/Modules/mediastream/SessionDescription.idl \ 1240 1252 $(WebCore)/Modules/navigatorcontentutils/NavigatorContentUtils.idl \ -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
r129672 r129908 49 49 #include "RTCSessionDescriptionDescriptor.h" 50 50 #include "RTCSessionDescriptionRequestImpl.h" 51 #include "RTCStatsCallback.h" 52 #include "RTCStatsRequestImpl.h" 51 53 #include "RTCVoidRequestImpl.h" 52 54 #include "ScriptExecutionContext.h" … … 380 382 } 381 383 384 void RTCPeerConnection::getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector) 385 { 386 RefPtr<RTCStatsRequestImpl> statsRequest = RTCStatsRequestImpl::create(scriptExecutionContext(), successCallback); 387 // FIXME: Add passing selector as part of the statsRequest. 388 m_peerHandler->getStats(statsRequest.release()); 389 } 390 382 391 void RTCPeerConnection::close(ExceptionCode& ec) 383 392 { -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
r129672 r129908 48 48 49 49 class MediaConstraints; 50 class MediaStreamTrack; 50 51 class RTCConfiguration; 51 52 class RTCErrorCallback; 52 53 class RTCSessionDescription; 53 54 class RTCSessionDescriptionCallback; 55 class RTCStatsCallback; 54 56 class VoidCallback; 55 57 … … 84 86 85 87 void removeStream(MediaStream*, ExceptionCode&); 88 89 void getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector); 86 90 87 91 void close(ExceptionCode&); -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
r129672 r129908 73 73 raises(DOMException); 74 74 75 void getStats(in [Callback] RTCStatsCallback successCallback, in [Optional=DefaultIsUndefined] MediaStreamTrack selector); 76 75 77 void close() 76 78 raises(DOMException); -
trunk/Source/WebCore/WebCore.gypi
r129894 r129908 466 466 'platform/mediastream/RTCSessionDescriptionDescriptor.h', 467 467 'platform/mediastream/RTCSessionDescriptionRequest.h', 468 'platform/mediastream/RTCStatsRequest.h', 468 469 'platform/mediastream/RTCVoidRequest.h', 469 470 'platform/mediastream/SessionDescriptionDescriptor.cpp', … … 873 874 'Modules/mediastream/RTCSessionDescription.idl', 874 875 'Modules/mediastream/RTCSessionDescriptionCallback.idl', 876 'Modules/mediastream/RTCStatsCallback.idl', 877 'Modules/mediastream/RTCStatsElement.idl', 878 'Modules/mediastream/RTCStatsReport.idl', 879 'Modules/mediastream/RTCStatsResponse.idl', 875 880 'Modules/mediastream/SessionDescription.idl', 876 881 'Modules/navigatorcontentutils/NavigatorContentUtils.idl', … … 1621 1626 'Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp', 1622 1627 'Modules/mediastream/RTCSessionDescriptionRequestImpl.h', 1628 'Modules/mediastream/RTCStatsElement.cpp', 1629 'Modules/mediastream/RTCStatsElement.h', 1630 'Modules/mediastream/RTCStatsReport.cpp', 1631 'Modules/mediastream/RTCStatsReport.h', 1632 'Modules/mediastream/RTCStatsRequestImpl.cpp', 1633 'Modules/mediastream/RTCStatsRequestImpl.h', 1634 'Modules/mediastream/RTCStatsResponse.cpp', 1635 'Modules/mediastream/RTCStatsResponse.h', 1623 1636 'Modules/mediastream/RTCVoidRequestImpl.cpp', 1624 1637 'Modules/mediastream/RTCVoidRequestImpl.h', … … 8386 8399 'platform/chromium/support/WebRTCSessionDescription.cpp', 8387 8400 'platform/chromium/support/WebRTCSessionDescriptionRequest.cpp', 8401 'platform/chromium/support/WebRTCStatsRequest.cpp', 8388 8402 'platform/chromium/support/WebRTCVoidRequest.cpp', 8389 8403 'platform/chromium/support/WebScrollbarThemeGeometryNative.cpp', -
trunk/Source/WebCore/platform/chromium/support/WebRTCStatsRequest.cpp
r129907 r129908 29 29 */ 30 30 31 #ifndef WebRTCPeerConnectionHandler_h 32 #define WebRTCPeerConnectionHandler_h 31 #include "config.h" 32 33 #if ENABLE(MEDIA_STREAM) 34 35 #include <public/WebRTCStatsRequest.h> 36 37 #include "RTCStatsRequest.h" 38 #include <wtf/PassOwnPtr.h> 39 40 using namespace WebCore; 33 41 34 42 namespace WebKit { 35 class WebMediaConstraints;36 class WebMediaStreamDescriptor;37 class WebRTCConfiguration;38 class WebRTCICECandidate;39 class WebRTCPeerConnectionHandlerClient;40 class WebRTCSessionDescription;41 class WebRTCSessionDescriptionRequest;42 class WebRTCVoidRequest;43 43 44 class WebRTCPeerConnectionHandler { 45 public: 46 virtual ~WebRTCPeerConnectionHandler() { } 44 WebRTCStatsRequest::WebRTCStatsRequest(const PassRefPtr<RTCStatsRequest>& request) 45 : m_private(request) 46 { 47 } 47 48 48 virtual bool initialize(const WebRTCConfiguration&, const WebMediaConstraints&) = 0; 49 void WebRTCStatsRequest::assign(const WebRTCStatsRequest& other) 50 { 51 m_private = other.m_private; 52 } 49 53 50 virtual void createOffer(const WebRTCSessionDescriptionRequest&, const WebMediaConstraints&) = 0; 51 virtual void createAnswer(const WebRTCSessionDescriptionRequest&, const WebMediaConstraints&) = 0; 52 virtual void setLocalDescription(const WebRTCVoidRequest&, const WebRTCSessionDescription&) = 0; 53 virtual void setRemoteDescription(const WebRTCVoidRequest&, const WebRTCSessionDescription&) = 0; 54 virtual WebRTCSessionDescription localDescription() = 0; 55 virtual WebRTCSessionDescription remoteDescription() = 0; 56 virtual bool updateICE(const WebRTCConfiguration&, const WebMediaConstraints&) = 0; 57 virtual bool addICECandidate(const WebRTCICECandidate&) = 0; 58 virtual bool addStream(const WebMediaStreamDescriptor&, const WebMediaConstraints&) = 0; 59 virtual void removeStream(const WebMediaStreamDescriptor&) = 0; 60 virtual void stop() = 0; 61 }; 54 void WebRTCStatsRequest::reset() 55 { 56 m_private.reset(); 57 } 58 59 void WebRTCStatsRequest::requestSucceeded() const 60 { 61 m_private->requestSucceeded(); 62 } 62 63 63 64 } // namespace WebKit 64 65 65 #endif // WebRTCPeerConnectionHandler_h 66 #endif // ENABLE(MEDIA_STREAM) 67 -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp
r129672 r129908 60 60 virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) OVERRIDE; 61 61 virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) OVERRIDE; 62 virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE; 62 63 virtual void stop() OVERRIDE; 63 64 … … 131 132 } 132 133 134 void RTCPeerConnectionHandlerDummy::getStats(PassRefPtr<RTCStatsRequest>) 135 { 136 } 137 133 138 void RTCPeerConnectionHandlerDummy::stop() 134 139 { -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h
r129672 r129908 46 46 class RTCSessionDescriptionDescriptor; 47 47 class RTCSessionDescriptionRequest; 48 class RTCStatsRequest; 48 49 class RTCVoidRequest; 49 50 … … 65 66 virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) = 0; 66 67 virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) = 0; 68 virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0; 67 69 virtual void stop() = 0; 68 70 -
trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp
r129672 r129908 41 41 #include "RTCSessionDescriptionDescriptor.h" 42 42 #include "RTCSessionDescriptionRequest.h" 43 #include "RTCStatsRequest.h" 43 44 #include "RTCVoidRequest.h" 44 45 #include <public/Platform.h> … … 49 50 #include <public/WebRTCSessionDescription.h> 50 51 #include <public/WebRTCSessionDescriptionRequest.h> 52 #include <public/WebRTCStatsRequest.h> 51 53 #include <public/WebRTCVoidRequest.h> 52 54 #include <wtf/PassOwnPtr.h> … … 157 159 } 158 160 161 void RTCPeerConnectionHandlerChromium::getStats(PassRefPtr<RTCStatsRequest> request) 162 { 163 if (!m_webHandler) 164 return; 165 166 m_webHandler->getStats(request); 167 } 168 159 169 void RTCPeerConnectionHandlerChromium::stop() 160 170 { -
trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h
r129672 r129908 65 65 virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) OVERRIDE; 66 66 virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) OVERRIDE; 67 virtual void getStats(PassRefPtr<RTCStatsRequest>) OVERRIDE; 67 68 virtual void stop() OVERRIDE; 68 69 -
trunk/Tools/ChangeLog
r129891 r129908 1 2012-09-28 Harald Tveit Alvestrand <harald@alvestrand.no> 2 3 Implement the GetStats interface on PeerConnection 4 https://bugs.webkit.org/show_bug.cgi?id=95193 5 6 Reviewed by Adam Barth. 7 8 * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp: 9 (RTCStatsRequestSucceededTask): 10 (RTCStatsRequestSucceededTask::RTCStatsRequestSucceededTask): 11 (MockWebRTCPeerConnectionHandler::getStats): 12 * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h: 13 (MockWebRTCPeerConnectionHandler): 14 1 15 2012-09-28 Kristóf Kosztyó <kkristof@inf.u-szeged.hu> 2 16 -
trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp
r129761 r129908 39 39 #include <public/WebRTCSessionDescription.h> 40 40 #include <public/WebRTCSessionDescriptionRequest.h> 41 #include <public/WebRTCStatsRequest.h> 41 42 #include <public/WebRTCVoidRequest.h> 42 43 #include <public/WebString.h> … … 79 80 private: 80 81 WebRTCSessionDescriptionRequest m_request; 82 }; 83 84 class RTCStatsRequestSucceededTask : public MethodTask<MockWebRTCPeerConnectionHandler> { 85 public: 86 RTCStatsRequestSucceededTask(MockWebRTCPeerConnectionHandler* object, const WebKit::WebRTCStatsRequest& request) 87 : MethodTask<MockWebRTCPeerConnectionHandler>(object) 88 , m_request(request) 89 { 90 } 91 92 virtual void runIfValid() OVERRIDE 93 { 94 m_request.requestSucceeded(); 95 } 96 97 private: 98 WebKit::WebRTCStatsRequest m_request; 81 99 }; 82 100 … … 189 207 } 190 208 209 void MockWebRTCPeerConnectionHandler::getStats(const WebRTCStatsRequest& request) 210 { 211 postTask(new RTCStatsRequestSucceededTask(this, request)); 212 } 213 214 191 215 void MockWebRTCPeerConnectionHandler::stop() 192 216 { -
trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h
r129672 r129908 38 38 #include <public/WebRTCSessionDescription.h> 39 39 #include <public/WebRTCSessionDescriptionRequest.h> 40 #include <public/WebRTCStatsRequest.h> 40 41 41 42 namespace WebKit { … … 59 60 virtual bool addStream(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaConstraints&) OVERRIDE; 60 61 virtual void removeStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE; 62 virtual void getStats(const WebKit::WebRTCStatsRequest&) OVERRIDE; 61 63 virtual void stop() OVERRIDE; 62 64
Note: See TracChangeset
for help on using the changeset viewer.