Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(63)

Side by Side Diff: third_party/WebKit/public/platform/WebRTCPeerConnectionHandler.h

Issue 2631433002: Rename RTCPeerConnection.updateIce to setConfiguration and make it work. (Closed)
Patch Set: Adding content_browsertest. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « third_party/WebKit/public/platform/WebRTCError.h ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions are 5 * modification, are permitted provided that the following conditions are
6 * met: 6 * met:
7 * 7 *
8 * * Redistributions of source code must retain the above copyright 8 * * Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * * Redistributions in binary form must reproduce the above 10 * * Redistributions in binary form must reproduce the above
(...skipping 23 matching lines...) Expand all
34 #include "WebRTCStats.h" 34 #include "WebRTCStats.h"
35 35
36 namespace blink { 36 namespace blink {
37 37
38 class WebMediaConstraints; 38 class WebMediaConstraints;
39 class WebMediaStream; 39 class WebMediaStream;
40 class WebMediaStreamTrack; 40 class WebMediaStreamTrack;
41 class WebRTCAnswerOptions; 41 class WebRTCAnswerOptions;
42 class WebRTCDTMFSenderHandler; 42 class WebRTCDTMFSenderHandler;
43 class WebRTCDataChannelHandler; 43 class WebRTCDataChannelHandler;
44 class WebRTCError;
44 class WebRTCICECandidate; 45 class WebRTCICECandidate;
45 class WebRTCOfferOptions; 46 class WebRTCOfferOptions;
46 class WebRTCSessionDescription; 47 class WebRTCSessionDescription;
47 class WebRTCSessionDescriptionRequest; 48 class WebRTCSessionDescriptionRequest;
48 class WebRTCStatsRequest; 49 class WebRTCStatsRequest;
49 class WebRTCVoidRequest; 50 class WebRTCVoidRequest;
50 class WebString; 51 class WebString;
51 struct WebRTCConfiguration; 52 struct WebRTCConfiguration;
52 struct WebRTCDataChannelInit; 53 struct WebRTCDataChannelInit;
53 54
(...skipping 11 matching lines...) Expand all
65 virtual void createAnswer(const WebRTCSessionDescriptionRequest&, 66 virtual void createAnswer(const WebRTCSessionDescriptionRequest&,
66 const WebMediaConstraints&) = 0; 67 const WebMediaConstraints&) = 0;
67 virtual void createAnswer(const WebRTCSessionDescriptionRequest&, 68 virtual void createAnswer(const WebRTCSessionDescriptionRequest&,
68 const WebRTCAnswerOptions&) = 0; 69 const WebRTCAnswerOptions&) = 0;
69 virtual void setLocalDescription(const WebRTCVoidRequest&, 70 virtual void setLocalDescription(const WebRTCVoidRequest&,
70 const WebRTCSessionDescription&) = 0; 71 const WebRTCSessionDescription&) = 0;
71 virtual void setRemoteDescription(const WebRTCVoidRequest&, 72 virtual void setRemoteDescription(const WebRTCVoidRequest&,
72 const WebRTCSessionDescription&) = 0; 73 const WebRTCSessionDescription&) = 0;
73 virtual WebRTCSessionDescription localDescription() = 0; 74 virtual WebRTCSessionDescription localDescription() = 0;
74 virtual WebRTCSessionDescription remoteDescription() = 0; 75 virtual WebRTCSessionDescription remoteDescription() = 0;
75 virtual bool setConfiguration(const WebRTCConfiguration&) = 0; 76 virtual bool setConfiguration(const WebRTCConfiguration&, WebRTCError&) = 0;
dcheng 2017/01/13 23:10:38 My personal feeling is it'd feel natural for this
Taylor_Brandstetter 2017/01/14 00:08:40 You're right. It's an output parameter in webrtc m
76 77
77 // DEPRECATED 78 // DEPRECATED
78 virtual bool addICECandidate(const WebRTCICECandidate&) { return false; } 79 virtual bool addICECandidate(const WebRTCICECandidate&) { return false; }
79 80
80 virtual bool addICECandidate(const WebRTCVoidRequest&, 81 virtual bool addICECandidate(const WebRTCVoidRequest&,
81 const WebRTCICECandidate&) { 82 const WebRTCICECandidate&) {
82 return false; 83 return false;
83 } 84 }
84 virtual bool addStream(const WebMediaStream&, const WebMediaConstraints&) = 0; 85 virtual bool addStream(const WebMediaStream&, const WebMediaConstraints&) = 0;
85 virtual void removeStream(const WebMediaStream&) = 0; 86 virtual void removeStream(const WebMediaStream&) = 0;
86 virtual void getStats(const WebRTCStatsRequest&) = 0; 87 virtual void getStats(const WebRTCStatsRequest&) = 0;
87 // Gets stats using the new stats collection API, see 88 // Gets stats using the new stats collection API, see
88 // third_party/webrtc/api/stats/. These will replace the old stats collection 89 // third_party/webrtc/api/stats/. These will replace the old stats collection
89 // API when the new API has matured enough. 90 // API when the new API has matured enough.
90 virtual void getStats(std::unique_ptr<WebRTCStatsReportCallback>) = 0; 91 virtual void getStats(std::unique_ptr<WebRTCStatsReportCallback>) = 0;
91 virtual WebRTCDataChannelHandler* createDataChannel( 92 virtual WebRTCDataChannelHandler* createDataChannel(
92 const WebString& label, 93 const WebString& label,
93 const WebRTCDataChannelInit&) = 0; 94 const WebRTCDataChannelInit&) = 0;
94 virtual WebRTCDTMFSenderHandler* createDTMFSender( 95 virtual WebRTCDTMFSenderHandler* createDTMFSender(
95 const WebMediaStreamTrack&) = 0; 96 const WebMediaStreamTrack&) = 0;
96 virtual void stop() = 0; 97 virtual void stop() = 0;
97 }; 98 };
98 99
99 } // namespace blink 100 } // namespace blink
100 101
101 #endif // WebRTCPeerConnectionHandler_h 102 #endif // WebRTCPeerConnectionHandler_h
OLDNEW
« no previous file with comments | « third_party/WebKit/public/platform/WebRTCError.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698