Source/WebCore/Modules/mediastream/RTCPeerConnection.h - Issue 10982093: Merge 129397 - MediaStream API: Fix the incorrectly spelled RTCPeerConnection::onnegotiationneeded …

Side by Side Diff: Source/WebCore/Modules/mediastream/RTCPeerConnection.h

Issue 10982093: Merge 129397 - MediaStream API: Fix the incorrectly spelled RTCPeerConnection::onnegotiationneeded … (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/

Patch Set: Created 8 years, 2 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 | « LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt ('k') | Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
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	5 * modification, are permitted provided that the following conditions

6 * are met:	6 * are met:

7 *	7 *

8 * 1. Redistributions of source code must retain the above copyright	8 * 1. 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 * 2. Redistributions in binary form must reproduce the above copyright	10 * 2. Redistributions in binary form must reproduce the above copyright

(...skipping 68 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 MediaStreamList* localStreams() const;	79 MediaStreamList* localStreams() const;

80	80

81 MediaStreamList* remoteStreams() const;	81 MediaStreamList* remoteStreams() const;

82	82

83 void addStream(const PassRefPtr<MediaStream>, const Dictionary& mediaConstra ints, ExceptionCode&);	83 void addStream(const PassRefPtr<MediaStream>, const Dictionary& mediaConstra ints, ExceptionCode&);

84	84

85 void removeStream(MediaStream*, ExceptionCode&);	85 void removeStream(MediaStream*, ExceptionCode&);

86	86

87 void close(ExceptionCode&);	87 void close(ExceptionCode&);

88	88

89 DEFINE_ATTRIBUTE_EVENT_LISTENER(negotationneeded);	89 DEFINE_ATTRIBUTE_EVENT_LISTENER(negotiationneeded);

90 DEFINE_ATTRIBUTE_EVENT_LISTENER(icecandidate);	90 DEFINE_ATTRIBUTE_EVENT_LISTENER(icecandidate);

91 DEFINE_ATTRIBUTE_EVENT_LISTENER(open);	91 DEFINE_ATTRIBUTE_EVENT_LISTENER(open);

92 DEFINE_ATTRIBUTE_EVENT_LISTENER(statechange);	92 DEFINE_ATTRIBUTE_EVENT_LISTENER(statechange);

93 DEFINE_ATTRIBUTE_EVENT_LISTENER(addstream);	93 DEFINE_ATTRIBUTE_EVENT_LISTENER(addstream);

94 DEFINE_ATTRIBUTE_EVENT_LISTENER(removestream);	94 DEFINE_ATTRIBUTE_EVENT_LISTENER(removestream);

95 DEFINE_ATTRIBUTE_EVENT_LISTENER(icechange);	95 DEFINE_ATTRIBUTE_EVENT_LISTENER(icechange);

96	96

97 // RTCPeerConnectionHandlerClient	97 // RTCPeerConnectionHandlerClient

98 virtual void negotiationNeeded() OVERRIDE;	98 virtual void negotiationNeeded() OVERRIDE;

99 virtual void didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescriptor>) OVERRIDE;	99 virtual void didGenerateIceCandidate(PassRefPtr<RTCIceCandidateDescriptor>) OVERRIDE;

(...skipping 34 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
134 RefPtr<MediaStreamList> m_remoteStreams;	134 RefPtr<MediaStreamList> m_remoteStreams;

135	135

136 OwnPtr<RTCPeerConnectionHandler> m_peerHandler;	136 OwnPtr<RTCPeerConnectionHandler> m_peerHandler;

137 };	137 };

138	138

139 } // namespace WebCore	139 } // namespace WebCore

140	140

141 #endif // ENABLE(MEDIA_STREAM)	141 #endif // ENABLE(MEDIA_STREAM)

142	142

143 #endif // RTCPeerConnection_h	143 #endif // RTCPeerConnection_h

OLD	NEW