| 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 247 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 258 return EventTargetNames::MediaSource; | 258 return EventTargetNames::MediaSource; |
| 259 } | 259 } |
| 260 | 260 |
| 261 ExecutionContext* MediaSource::executionContext() const | 261 ExecutionContext* MediaSource::executionContext() const |
| 262 { | 262 { |
| 263 return ActiveDOMObject::executionContext(); | 263 return ActiveDOMObject::executionContext(); |
| 264 } | 264 } |
| 265 | 265 |
| 266 DEFINE_TRACE(MediaSource) | 266 DEFINE_TRACE(MediaSource) |
| 267 { | 267 { |
| 268 #if ENABLE(OILPAN) | |
| 269 visitor->trace(m_asyncEventQueue); | 268 visitor->trace(m_asyncEventQueue); |
| 270 #endif | |
| 271 visitor->trace(m_attachedElement); | 269 visitor->trace(m_attachedElement); |
| 272 visitor->trace(m_sourceBuffers); | 270 visitor->trace(m_sourceBuffers); |
| 273 visitor->trace(m_activeSourceBuffers); | 271 visitor->trace(m_activeSourceBuffers); |
| 274 RefCountedGarbageCollectedEventTargetWithInlineData<MediaSource>::trace(visi
tor); | 272 RefCountedGarbageCollectedEventTargetWithInlineData<MediaSource>::trace(visi
tor); |
| 275 ActiveDOMObject::trace(visitor); | 273 ActiveDOMObject::trace(visitor); |
| 276 } | 274 } |
| 277 | 275 |
| 278 void MediaSource::setWebMediaSourceAndOpen(PassOwnPtr<WebMediaSource> webMediaSo
urce) | 276 void MediaSource::setWebMediaSourceAndOpen(PassOwnPtr<WebMediaSource> webMediaSo
urce) |
| 279 { | 277 { |
| 280 TRACE_EVENT_ASYNC_END0("media", "MediaSource::attachToElement", this); | 278 TRACE_EVENT_ASYNC_END0("media", "MediaSource::attachToElement", this); |
| (...skipping 319 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 600 | 598 |
| 601 m_asyncEventQueue->enqueueEvent(event.release()); | 599 m_asyncEventQueue->enqueueEvent(event.release()); |
| 602 } | 600 } |
| 603 | 601 |
| 604 URLRegistry& MediaSource::registry() const | 602 URLRegistry& MediaSource::registry() const |
| 605 { | 603 { |
| 606 return MediaSourceRegistry::registry(); | 604 return MediaSourceRegistry::registry(); |
| 607 } | 605 } |
| 608 | 606 |
| 609 } // namespace blink | 607 } // namespace blink |
| OLD | NEW |