Title: [145740] trunk/Source/Platform
- Revision
- 145740
- Author
- tom...@google.com
- Date
- 2013-03-13 12:58:06 -0700 (Wed, 13 Mar 2013)
Log Message
[chromium] MediaStream API: Cleaning away deprecated and unused states
https://bugs.webkit.org/show_bug.cgi?id=112258
Reviewed by Adam Barth.
* chromium/public/WebRTCPeerConnectionHandler.h:
(WebRTCPeerConnectionHandler):
* chromium/public/WebRTCPeerConnectionHandlerClient.h:
(WebRTCPeerConnectionHandlerClient):
Modified Paths
Diff
Modified: trunk/Source/Platform/ChangeLog (145739 => 145740)
--- trunk/Source/Platform/ChangeLog 2013-03-13 19:55:41 UTC (rev 145739)
+++ trunk/Source/Platform/ChangeLog 2013-03-13 19:58:06 UTC (rev 145740)
@@ -1,3 +1,15 @@
+2013-03-13 Tommy Widenflycht <tom...@google.com>
+
+ [chromium] MediaStream API: Cleaning away deprecated and unused states
+ https://bugs.webkit.org/show_bug.cgi?id=112258
+
+ Reviewed by Adam Barth.
+
+ * chromium/public/WebRTCPeerConnectionHandler.h:
+ (WebRTCPeerConnectionHandler):
+ * chromium/public/WebRTCPeerConnectionHandlerClient.h:
+ (WebRTCPeerConnectionHandlerClient):
+
2013-03-13 Zan Dobersek <zdober...@igalia.com>
[GTK] Build fixes after 145552
Modified: trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h (145739 => 145740)
--- trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h 2013-03-13 19:55:41 UTC (rev 145739)
+++ trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandler.h 2013-03-13 19:58:06 UTC (rev 145740)
@@ -62,10 +62,9 @@
virtual bool addICECandidate(const WebRTCICECandidate&) = 0;
virtual bool addStream(const WebMediaStream&, const WebMediaConstraints&) = 0;
virtual void removeStream(const WebMediaStream&) = 0;
- // FIXME: Remove default implementation when clients have changed.
- virtual void getStats(const WebRTCStatsRequest&) { }
- virtual WebRTCDataChannelHandler* createDataChannel(const WebString& label, bool reliable) { return 0; }
- virtual WebRTCDTMFSenderHandler* createDTMFSender(const WebMediaStreamTrack& track) { return 0; }
+ virtual void getStats(const WebRTCStatsRequest&) = 0;
+ virtual WebRTCDataChannelHandler* createDataChannel(const WebString& label, bool reliable) = 0;
+ virtual WebRTCDTMFSenderHandler* createDTMFSender(const WebMediaStreamTrack&) = 0;
virtual void stop() = 0;
};
Modified: trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h (145739 => 145740)
--- trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h 2013-03-13 19:55:41 UTC (rev 145739)
+++ trunk/Source/Platform/chromium/public/WebRTCPeerConnectionHandlerClient.h 2013-03-13 19:58:06 UTC (rev 145740)
@@ -67,44 +67,12 @@
virtual void negotiationNeeded() = 0;
virtual void didGenerateICECandidate(const WebRTCICECandidate&) = 0;
- virtual void didChangeSignalingState(SignalingState) { }
- virtual void didChangeICEGatheringState(ICEGatheringState) { }
- virtual void didChangeICEConnectionState(ICEConnectionState) { }
+ virtual void didChangeSignalingState(SignalingState) = 0;
+ virtual void didChangeICEGatheringState(ICEGatheringState) = 0;
+ virtual void didChangeICEConnectionState(ICEConnectionState) = 0;
virtual void didAddRemoteStream(const WebMediaStream&) = 0;
virtual void didRemoveRemoteStream(const WebMediaStream&) = 0;
- virtual void didAddRemoteDataChannel(WebRTCDataChannelHandler*) { }
-
- // DEPRECATED
- enum ReadyState {
- ReadyStateStable = 1,
- ReadyStateHaveLocalOffer = 2,
- ReadyStateHaveRemoteOffer = 3,
- ReadyStateHaveLocalPrAnswer = 4,
- ReadyStateHaveRemotePrAnswer = 5,
- ReadyStateClosed = 6,
- ReadyStateNew = 7,
- ReadyStateActive = 8,
- ReadyStateClosing = 9,
- ReadyStateOpening = 10
- };
-
- // DEPRECATED
- enum ICEState {
- ICEStateStarting = 1,
- ICEStateChecking = 2,
- ICEStateConnected = 3,
- ICEStateCompleted = 4,
- ICEStateFailed = 5,
- ICEStateDisconnected = 6,
- ICEStateClosed = 7,
- ICEStateNew = 8,
- ICEStateGathering = 9,
- ICEStateWaiting = 10
- };
-
- // DEPRECATED
- virtual void didChangeReadyState(ReadyState) { }
- virtual void didChangeICEState(ICEState) { }
+ virtual void didAddRemoteDataChannel(WebRTCDataChannelHandler*) = 0;
};
} // namespace WebKit
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes