| 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 are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * 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 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 251 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 { | 262 { |
| 263 return ActiveDOMObject::executionContext(); | 263 return ActiveDOMObject::executionContext(); |
| 264 } | 264 } |
| 265 | 265 |
| 266 void MediaSource::clearWeakMembers(Visitor* visitor) | 266 void MediaSource::clearWeakMembers(Visitor* visitor) |
| 267 { | 267 { |
| 268 #if ENABLE(OILPAN) | 268 #if ENABLE(OILPAN) |
| 269 // Oilpan: If the MediaSource survived, but its attached media | 269 // Oilpan: If the MediaSource survived, but its attached media |
| 270 // element did not, signal the element that it can safely | 270 // element did not, signal the element that it can safely |
| 271 // notify its MediaSource during finalization by calling close(). | 271 // notify its MediaSource during finalization by calling close(). |
| 272 if (m_attachedElement && !visitor->isHeapObjectAlive(m_attachedElement)) { | 272 if (m_attachedElement && !Heap::isHeapObjectAlive(m_attachedElement)) { |
| 273 m_attachedElement->setCloseMediaSourceWhenFinalizing(); | 273 m_attachedElement->setCloseMediaSourceWhenFinalizing(); |
| 274 m_attachedElement.clear(); | 274 m_attachedElement.clear(); |
| 275 } | 275 } |
| 276 #endif | 276 #endif |
| 277 } | 277 } |
| 278 | 278 |
| 279 DEFINE_TRACE(MediaSource) | 279 DEFINE_TRACE(MediaSource) |
| 280 { | 280 { |
| 281 #if ENABLE(OILPAN) | 281 #if ENABLE(OILPAN) |
| 282 visitor->trace(m_asyncEventQueue); | 282 visitor->trace(m_asyncEventQueue); |
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 613 | 613 |
| 614 m_asyncEventQueue->enqueueEvent(event.release()); | 614 m_asyncEventQueue->enqueueEvent(event.release()); |
| 615 } | 615 } |
| 616 | 616 |
| 617 URLRegistry& MediaSource::registry() const | 617 URLRegistry& MediaSource::registry() const |
| 618 { | 618 { |
| 619 return MediaSourceRegistry::registry(); | 619 return MediaSourceRegistry::registry(); |
| 620 } | 620 } |
| 621 | 621 |
| 622 } // namespace blink | 622 } // namespace blink |
| OLD | NEW |