commit ccca67c26a72bef161d295fe5527006fd4ece7ce
author tommyw@google.com <tommyw@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Mar 13 19:58:06 2013
committer tommyw@google.com <tommyw@google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed Mar 13 19:58:06 2013
tree a08caf3b02d0a4b63af26ba91c537474d947cf2a
parent da2b01537525ca30d9f4951d91f3749213a7c7a2

[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):


git-svn-id: https://svn.webkit.org/repository/webkit/trunk/Source/Platform/chromium/public@145740 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebRTCPeerConnectionHandler.h

diff --git a/WebRTCPeerConnectionHandler.h b/WebRTCPeerConnectionHandler.h
index 6596773..c4defa8 100644
--- a/WebRTCPeerConnectionHandler.h
+++ b/WebRTCPeerConnectionHandler.h
@@ -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;
 };
 

WebRTCPeerConnectionHandlerClient.h

diff --git a/WebRTCPeerConnectionHandlerClient.h b/WebRTCPeerConnectionHandlerClient.h
index 7032c39..63d6a76 100644
--- a/WebRTCPeerConnectionHandlerClient.h
+++ b/WebRTCPeerConnectionHandlerClient.h
@@ -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