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

Side by Side Diff: third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.h

Issue 1773813007: blink: Rename modules/ method to prefix with get when they collide. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: clash-modules: rebase-fixes Created 4 years, 9 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
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 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 void didChangeICEGatheringState(ICEGatheringState) override; 134 void didChangeICEGatheringState(ICEGatheringState) override;
135 void didChangeICEConnectionState(ICEConnectionState) override; 135 void didChangeICEConnectionState(ICEConnectionState) override;
136 void didAddRemoteStream(const WebMediaStream&) override; 136 void didAddRemoteStream(const WebMediaStream&) override;
137 void didRemoveRemoteStream(const WebMediaStream&) override; 137 void didRemoveRemoteStream(const WebMediaStream&) override;
138 void didAddRemoteDataChannel(WebRTCDataChannelHandler*) override; 138 void didAddRemoteDataChannel(WebRTCDataChannelHandler*) override;
139 void releasePeerConnectionHandler() override; 139 void releasePeerConnectionHandler() override;
140 void closePeerConnection() override; 140 void closePeerConnection() override;
141 141
142 // EventTarget 142 // EventTarget
143 const AtomicString& interfaceName() const override; 143 const AtomicString& interfaceName() const override;
144 ExecutionContext* executionContext() const override; 144 ExecutionContext* getExecutionContext() const override;
145 145
146 // ActiveDOMObject 146 // ActiveDOMObject
147 void suspend() override; 147 void suspend() override;
148 void resume() override; 148 void resume() override;
149 void stop() override; 149 void stop() override;
150 // We keep the this object alive until either stopped or closed. 150 // We keep the this object alive until either stopped or closed.
151 bool hasPendingActivity() const override 151 bool hasPendingActivity() const override
152 { 152 {
153 return !m_closed && !m_stopped; 153 return !m_closed && !m_stopped;
154 } 154 }
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 Member<AsyncMethodRunner<RTCPeerConnection>> m_dispatchScheduledEventRunner; 206 Member<AsyncMethodRunner<RTCPeerConnection>> m_dispatchScheduledEventRunner;
207 HeapVector<Member<EventWrapper>> m_scheduledEvents; 207 HeapVector<Member<EventWrapper>> m_scheduledEvents;
208 208
209 bool m_stopped; 209 bool m_stopped;
210 bool m_closed; 210 bool m_closed;
211 }; 211 };
212 212
213 } // namespace blink 213 } // namespace blink
214 214
215 #endif // RTCPeerConnection_h 215 #endif // RTCPeerConnection_h
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698