| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 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 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 71 |
| 72 RTCDTMFSender::~RTCDTMFSender() | 72 RTCDTMFSender::~RTCDTMFSender() |
| 73 { | 73 { |
| 74 } | 74 } |
| 75 | 75 |
| 76 void RTCDTMFSender::dispose() | 76 void RTCDTMFSender::dispose() |
| 77 { | 77 { |
| 78 // Promptly clears a raw reference from content/ to an on-heap object | 78 // Promptly clears a raw reference from content/ to an on-heap object |
| 79 // so that content/ doesn't access it in a lazy sweeping phase. | 79 // so that content/ doesn't access it in a lazy sweeping phase. |
| 80 m_handler->setClient(nullptr); | 80 m_handler->setClient(nullptr); |
| 81 m_handler.clear(); | 81 m_handler.reset(); |
| 82 } | 82 } |
| 83 | 83 |
| 84 bool RTCDTMFSender::canInsertDTMF() const | 84 bool RTCDTMFSender::canInsertDTMF() const |
| 85 { | 85 { |
| 86 return m_handler->canInsertDTMF(); | 86 return m_handler->canInsertDTMF(); |
| 87 } | 87 } |
| 88 | 88 |
| 89 MediaStreamTrack* RTCDTMFSender::track() const | 89 MediaStreamTrack* RTCDTMFSender::track() const |
| 90 { | 90 { |
| 91 return m_track.get(); | 91 return m_track.get(); |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 174 | 174 |
| 175 DEFINE_TRACE(RTCDTMFSender) | 175 DEFINE_TRACE(RTCDTMFSender) |
| 176 { | 176 { |
| 177 visitor->trace(m_track); | 177 visitor->trace(m_track); |
| 178 visitor->trace(m_scheduledEvents); | 178 visitor->trace(m_scheduledEvents); |
| 179 EventTargetWithInlineData::trace(visitor); | 179 EventTargetWithInlineData::trace(visitor); |
| 180 ActiveDOMObject::trace(visitor); | 180 ActiveDOMObject::trace(visitor); |
| 181 } | 181 } |
| 182 | 182 |
| 183 } // namespace blink | 183 } // namespace blink |
| OLD | NEW |