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

Side by Side Diff: third_party/WebKit/Source/modules/peerconnection/RTCPeerConnection.cpp

Issue 2578193004: Remove ActiveScriptWrappableBase::m_scriptWrappable (Closed)
Patch Set: temp Created 4 years 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 469 matching lines...) Expand 10 before | Expand all | Expand 10 after
480 peerConnection->m_peerHandler->logSelectedRtcpMuxPolicy( 480 peerConnection->m_peerHandler->logSelectedRtcpMuxPolicy(
481 selectedRtcpMuxPolicy); 481 selectedRtcpMuxPolicy);
482 482
483 return peerConnection; 483 return peerConnection;
484 } 484 }
485 485
486 RTCPeerConnection::RTCPeerConnection(ExecutionContext* context, 486 RTCPeerConnection::RTCPeerConnection(ExecutionContext* context,
487 const WebRTCConfiguration& configuration, 487 const WebRTCConfiguration& configuration,
488 WebMediaConstraints constraints, 488 WebMediaConstraints constraints,
489 ExceptionState& exceptionState) 489 ExceptionState& exceptionState)
490 : ActiveScriptWrappable<RTCPeerConnection>(this), 490 : SuspendableObject(context),
491 SuspendableObject(context),
492 m_signalingState(SignalingStateStable), 491 m_signalingState(SignalingStateStable),
493 m_iceGatheringState(ICEGatheringStateNew), 492 m_iceGatheringState(ICEGatheringStateNew),
494 m_iceConnectionState(ICEConnectionStateNew), 493 m_iceConnectionState(ICEConnectionStateNew),
495 m_dispatchScheduledEventRunner( 494 m_dispatchScheduledEventRunner(
496 AsyncMethodRunner<RTCPeerConnection>::create( 495 AsyncMethodRunner<RTCPeerConnection>::create(
497 this, 496 this,
498 &RTCPeerConnection::dispatchScheduledEvent)), 497 &RTCPeerConnection::dispatchScheduledEvent)),
499 m_stopped(false), 498 m_stopped(false),
500 m_closed(false), 499 m_closed(false),
501 m_hasDataChannels(false) { 500 m_hasDataChannels(false) {
(...skipping 987 matching lines...) Expand 10 before | Expand all | Expand 10 after
1489 DEFINE_TRACE(RTCPeerConnection) { 1488 DEFINE_TRACE(RTCPeerConnection) {
1490 visitor->trace(m_localStreams); 1489 visitor->trace(m_localStreams);
1491 visitor->trace(m_remoteStreams); 1490 visitor->trace(m_remoteStreams);
1492 visitor->trace(m_dispatchScheduledEventRunner); 1491 visitor->trace(m_dispatchScheduledEventRunner);
1493 visitor->trace(m_scheduledEvents); 1492 visitor->trace(m_scheduledEvents);
1494 EventTargetWithInlineData::trace(visitor); 1493 EventTargetWithInlineData::trace(visitor);
1495 SuspendableObject::trace(visitor); 1494 SuspendableObject::trace(visitor);
1496 } 1495 }
1497 1496
1498 } // namespace blink 1497 } // namespace blink
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698