Chromium Code Reviews| 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 * 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 316 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 327 void RTCDataChannel::clearWeakMembers(Visitor* visitor) | 327 void RTCDataChannel::clearWeakMembers(Visitor* visitor) |
| 328 { | 328 { |
| 329 if (visitor->isAlive(m_connection)) | 329 if (visitor->isAlive(m_connection)) |
| 330 return; | 330 return; |
| 331 stop(); | 331 stop(); |
| 332 m_connection = nullptr; | 332 m_connection = nullptr; |
| 333 } | 333 } |
| 334 | 334 |
| 335 DEFINE_TRACE(RTCDataChannel) | 335 DEFINE_TRACE(RTCDataChannel) |
| 336 { | 336 { |
| 337 #if ENABLE(OILPAN) | |
| 337 visitor->trace(m_scheduledEvents); | 338 visitor->trace(m_scheduledEvents); |
| 339 #endif | |
| 340 visitor->trace(m_connection); | |
|
sof
2015/03/03 08:50:36
Same; this shouldn't be traced.
| |
| 338 visitor->template registerWeakMembers<RTCDataChannel, &RTCDataChannel::clear WeakMembers>(this); | 341 visitor->template registerWeakMembers<RTCDataChannel, &RTCDataChannel::clear WeakMembers>(this); |
| 339 RefCountedGarbageCollectedEventTargetWithInlineData<RTCDataChannel>::trace(v isitor); | 342 RefCountedGarbageCollectedEventTargetWithInlineData<RTCDataChannel>::trace(v isitor); |
| 340 } | 343 } |
| 341 | 344 |
| 342 } // namespace blink | 345 } // namespace blink |
| OLD | NEW |