Changeset 129672 in webkit
- Timestamp:
- Sep 26, 2012 11:11:44 AM (12 years ago)
- Location:
- trunk
- Files:
-
- 18 deleted
- 17 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r129671 r129672 1 2012-09-26 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r129654. 4 http://trac.webkit.org/changeset/129654 5 https://bugs.webkit.org/show_bug.cgi?id=97702 6 7 breaks chromium windows build (Requested by schenney on 8 #webkit). 9 10 * fast/mediastream/RTCPeerConnection-stats-expected.txt: Removed. 11 * fast/mediastream/RTCPeerConnection-stats.html: Removed. 12 1 13 2012-09-26 Tullio Lucena <tullio.lucena@openbossa.org> 2 14 -
trunk/Source/Platform/ChangeLog
r129654 r129672 1 2012-09-26 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r129654. 4 http://trac.webkit.org/changeset/129654 5 https://bugs.webkit.org/show_bug.cgi?id=97702 6 7 breaks chromium windows build (Requested by schenney on 8 #webkit). 9 10 * chromium/public/WebRTCPeerConnectionHandler.h: 11 (WebKit): 12 (WebRTCPeerConnectionHandler): 13 * chromium/public/WebRTCStatsRequest.h: Removed. 14 1 15 2012-09-26 Harald Tveit Alvestrand <harald@alvestrand.no> 2 16 -
trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h
r129654 r129672 40 40 class WebRTCSessionDescription; 41 41 class WebRTCSessionDescriptionRequest; 42 class WebRTCStatsRequest;43 42 class WebRTCVoidRequest; 44 43 … … 59 58 virtual bool addStream(const WebMediaStreamDescriptor&, const WebMediaConstraints&) = 0; 60 59 virtual void removeStream(const WebMediaStreamDescriptor&) = 0; 61 // FIXME: Remove default implementation when clients have changed.62 virtual void getStats(const WebRTCStatsRequest&) { }63 60 virtual void stop() = 0; 64 61 }; -
trunk/Source/WebCore/CMakeLists.txt
r129654 r129672 229 229 Modules/mediastream/RTCSessionDescription.idl 230 230 Modules/mediastream/RTCSessionDescriptionCallback.idl 231 Modules/mediastream/RTCStatsCallback.idl232 Modules/mediastream/RTCStatsElement.idl233 Modules/mediastream/RTCStatsReport.idl234 Modules/mediastream/RTCStatsResponse.idl235 231 Modules/mediastream/SessionDescription.idl 236 232 … … 866 862 Modules/mediastream/RTCSessionDescription.cpp 867 863 Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp 868 Modules/mediastream/RTCStatsElement.cpp869 Modules/mediastream/RTCStatsReport.cpp870 Modules/mediastream/RTCStatsRequestImpl.cpp871 Modules/mediastream/RTCStatsResponse.cpp872 864 Modules/mediastream/RTCVoidRequestImpl.cpp 873 865 Modules/mediastream/SessionDescription.cpp -
trunk/Source/WebCore/ChangeLog
r129670 r129672 1 2012-09-26 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r129654. 4 http://trac.webkit.org/changeset/129654 5 https://bugs.webkit.org/show_bug.cgi?id=97702 6 7 breaks chromium windows build (Requested by schenney on 8 #webkit). 9 10 * CMakeLists.txt: 11 * GNUmakefile.list.am: 12 * Modules/mediastream/RTCPeerConnection.cpp: 13 * Modules/mediastream/RTCPeerConnection.h: 14 (WebCore): 15 (RTCPeerConnection): 16 * Modules/mediastream/RTCPeerConnection.idl: 17 * Modules/mediastream/RTCStatsCallback.h: Removed. 18 * Modules/mediastream/RTCStatsCallback.idl: Removed. 19 * Modules/mediastream/RTCStatsElement.cpp: Removed. 20 * Modules/mediastream/RTCStatsElement.h: Removed. 21 * Modules/mediastream/RTCStatsElement.idl: Removed. 22 * Modules/mediastream/RTCStatsReport.cpp: Removed. 23 * Modules/mediastream/RTCStatsReport.h: Removed. 24 * Modules/mediastream/RTCStatsReport.idl: Removed. 25 * Modules/mediastream/RTCStatsRequestImpl.cpp: Removed. 26 * Modules/mediastream/RTCStatsRequestImpl.h: Removed. 27 * Modules/mediastream/RTCStatsResponse.cpp: Removed. 28 * Modules/mediastream/RTCStatsResponse.h: Removed. 29 * Modules/mediastream/RTCStatsResponse.idl: Removed. 30 * WebCore.gypi: 31 * platform/chromium/support/WebRTCStatsRequest.cpp: Removed. 32 * platform/mediastream/RTCPeerConnectionHandler.cpp: 33 (RTCPeerConnectionHandlerDummy): 34 * platform/mediastream/RTCPeerConnectionHandler.h: 35 (WebCore): 36 (RTCPeerConnectionHandler): 37 * platform/mediastream/RTCStatsRequest.h: Removed. 38 * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp: 39 * platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h: 40 (RTCPeerConnectionHandlerChromium): 41 1 42 2012-09-26 Philip Rogers <pdr@google.com> 2 43 -
trunk/Source/WebCore/GNUmakefile.list.am
r129654 r129672 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 \650 642 DerivedSources/WebCore/JSScreen.cpp \ 651 643 DerivedSources/WebCore/JSScreen.h \ … … 1245 1237 $(WebCore)/Modules/mediastream/RTCSessionDescription.idl \ 1246 1238 $(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 \1251 1239 $(WebCore)/Modules/mediastream/SessionDescription.idl \ 1252 1240 $(WebCore)/Modules/navigatorcontentutils/NavigatorContentUtils.idl \ -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp
r129654 r129672 49 49 #include "RTCSessionDescriptionDescriptor.h" 50 50 #include "RTCSessionDescriptionRequestImpl.h" 51 #include "RTCStatsCallback.h"52 #include "RTCStatsRequestImpl.h"53 51 #include "RTCVoidRequestImpl.h" 54 52 #include "ScriptExecutionContext.h" … … 382 380 } 383 381 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 391 382 void RTCPeerConnection::close(ExceptionCode& ec) 392 383 { -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h
r129654 r129672 48 48 49 49 class MediaConstraints; 50 class MediaStreamTrack;51 50 class RTCConfiguration; 52 51 class RTCErrorCallback; 53 52 class RTCSessionDescription; 54 53 class RTCSessionDescriptionCallback; 55 class RTCStatsCallback;56 54 class VoidCallback; 57 55 … … 86 84 87 85 void removeStream(MediaStream*, ExceptionCode&); 88 89 void getStats(PassRefPtr<RTCStatsCallback> successCallback, PassRefPtr<MediaStreamTrack> selector);90 86 91 87 void close(ExceptionCode&); -
trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.idl
r129654 r129672 73 73 raises(DOMException); 74 74 75 void getStats(in [Callback] RTCStatsCallback successCallback, in [Optional=DefaultIsUndefined] MediaStreamTrack selector);76 77 75 void close() 78 76 raises(DOMException); -
trunk/Source/WebCore/WebCore.gypi
r129654 r129672 466 466 'platform/mediastream/RTCSessionDescriptionDescriptor.h', 467 467 'platform/mediastream/RTCSessionDescriptionRequest.h', 468 'platform/mediastream/RTCStatsRequest.h',469 468 'platform/mediastream/RTCVoidRequest.h', 470 469 'platform/mediastream/SessionDescriptionDescriptor.cpp', … … 875 874 'Modules/mediastream/RTCSessionDescription.idl', 876 875 'Modules/mediastream/RTCSessionDescriptionCallback.idl', 877 'Modules/mediastream/RTCStatsCallback.idl',878 'Modules/mediastream/RTCStatsElement.idl',879 'Modules/mediastream/RTCStatsReport.idl',880 'Modules/mediastream/RTCStatsResponse.idl',881 876 'Modules/mediastream/SessionDescription.idl', 882 877 'Modules/navigatorcontentutils/NavigatorContentUtils.idl', … … 1627 1622 'Modules/mediastream/RTCSessionDescriptionRequestImpl.cpp', 1628 1623 'Modules/mediastream/RTCSessionDescriptionRequestImpl.h', 1629 'Modules/mediastream/RTCStatsElement.cpp',1630 'Modules/mediastream/RTCStatsElement.h',1631 'Modules/mediastream/RTCStatsReport.cpp',1632 'Modules/mediastream/RTCStatsReport.h',1633 'Modules/mediastream/RTCStatsRequestImpl.cpp',1634 'Modules/mediastream/RTCStatsRequestImpl.h',1635 'Modules/mediastream/RTCStatsResponse.cpp',1636 'Modules/mediastream/RTCStatsResponse.h',1637 1624 'Modules/mediastream/RTCVoidRequestImpl.cpp', 1638 1625 'Modules/mediastream/RTCVoidRequestImpl.h', … … 8401 8388 'platform/chromium/support/WebRTCSessionDescription.cpp', 8402 8389 'platform/chromium/support/WebRTCSessionDescriptionRequest.cpp', 8403 'platform/chromium/support/WebRTCStatsRequest.cpp',8404 8390 'platform/chromium/support/WebRTCVoidRequest.cpp', 8405 8391 'platform/chromium/support/WebScrollbarThemeGeometryNative.cpp', -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.cpp
r129654 r129672 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;63 62 virtual void stop() OVERRIDE; 64 63 … … 132 131 } 133 132 134 void RTCPeerConnectionHandlerDummy::getStats(PassRefPtr<RTCStatsRequest>)135 {136 }137 138 133 void RTCPeerConnectionHandlerDummy::stop() 139 134 { -
trunk/Source/WebCore/platform/mediastream/RTCPeerConnectionHandler.h
r129654 r129672 46 46 class RTCSessionDescriptionDescriptor; 47 47 class RTCSessionDescriptionRequest; 48 class RTCStatsRequest;49 48 class RTCVoidRequest; 50 49 … … 66 65 virtual bool addStream(PassRefPtr<MediaStreamDescriptor>, PassRefPtr<MediaConstraints>) = 0; 67 66 virtual void removeStream(PassRefPtr<MediaStreamDescriptor>) = 0; 68 virtual void getStats(PassRefPtr<RTCStatsRequest>) = 0;69 67 virtual void stop() = 0; 70 68 -
trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.cpp
r129654 r129672 49 49 #include <public/WebRTCSessionDescription.h> 50 50 #include <public/WebRTCSessionDescriptionRequest.h> 51 #include <public/WebRTCStatsRequest.h>52 51 #include <public/WebRTCVoidRequest.h> 53 52 #include <wtf/PassOwnPtr.h> … … 158 157 } 159 158 160 void RTCPeerConnectionHandlerChromium::getStats(PassRefPtr<RTCStatsRequest> request)161 {162 if (!m_webHandler)163 return;164 165 m_webHandler->getStats(request);166 }167 168 159 void RTCPeerConnectionHandlerChromium::stop() 169 160 { -
trunk/Source/WebCore/platform/mediastream/chromium/RTCPeerConnectionHandlerChromium.h
r129654 r129672 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;68 67 virtual void stop() OVERRIDE; 69 68 -
trunk/Tools/ChangeLog
r129663 r129672 1 2012-09-26 Sheriff Bot <webkit.review.bot@gmail.com> 2 3 Unreviewed, rolling out r129654. 4 http://trac.webkit.org/changeset/129654 5 https://bugs.webkit.org/show_bug.cgi?id=97702 6 7 breaks chromium windows build (Requested by schenney on 8 #webkit). 9 10 * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp: 11 * DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h: 12 (MockWebRTCPeerConnectionHandler): 13 1 14 2012-09-26 Michael Saboff <msaboff@apple.com> 2 15 -
trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.cpp
r129654 r129672 38 38 #include <public/WebRTCSessionDescription.h> 39 39 #include <public/WebRTCSessionDescriptionRequest.h> 40 #include <public/WebRTCStatsRequest.h>41 40 #include <public/WebRTCVoidRequest.h> 42 41 #include <public/WebString.h> … … 81 80 }; 82 81 83 class RTCStatsRequestSucceededTask : public MethodTask<MockWebRTCPeerConnectionHandler> {84 public:85 RTCStatsRequestSucceededTask(MockWebRTCPeerConnectionHandler* object, const WebKit::WebRTCStatsRequest& request)86 : MethodTask<MockWebRTCPeerConnectionHandler>(object)87 , m_request(request)88 {89 }90 91 virtual void runIfValid() OVERRIDE92 {93 m_request.requestSucceeded();94 }95 96 private:97 WebKit::WebRTCStatsRequest m_request;98 };99 100 82 class RTCVoidRequestTask : public MethodTask<MockWebRTCPeerConnectionHandler> { 101 83 public: … … 242 224 } 243 225 244 void MockWebRTCPeerConnectionHandler::getStats(const WebRTCStatsRequest& request)245 {246 postTask(new RTCStatsRequestSucceededTask(this, request));247 }248 249 250 226 void MockWebRTCPeerConnectionHandler::stop() 251 227 { -
trunk/Tools/DumpRenderTree/chromium/MockWebRTCPeerConnectionHandler.h
r129654 r129672 38 38 #include <public/WebRTCSessionDescription.h> 39 39 #include <public/WebRTCSessionDescriptionRequest.h> 40 #include <public/WebRTCStatsRequest.h>41 40 42 41 namespace WebKit { … … 60 59 virtual bool addStream(const WebKit::WebMediaStreamDescriptor&, const WebKit::WebMediaConstraints&) OVERRIDE; 61 60 virtual void removeStream(const WebKit::WebMediaStreamDescriptor&) OVERRIDE; 62 virtual void getStats(const WebKit::WebRTCStatsRequest&) OVERRIDE;63 61 virtual void stop() OVERRIDE; 64 62
Note: See TracChangeset
for help on using the changeset viewer.