| 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 25 matching lines...) Expand all Loading... |
| 36 #include "bindings/v8/ExceptionStatePlaceholder.h" | 36 #include "bindings/v8/ExceptionStatePlaceholder.h" |
| 37 #include "core/dom/ExceptionCode.h" | 37 #include "core/dom/ExceptionCode.h" |
| 38 #include "core/events/Event.h" | 38 #include "core/events/Event.h" |
| 39 #include "core/events/GenericEventQueue.h" | 39 #include "core/events/GenericEventQueue.h" |
| 40 #include "core/html/HTMLMediaElement.h" | 40 #include "core/html/HTMLMediaElement.h" |
| 41 #include "core/html/TimeRanges.h" | 41 #include "core/html/TimeRanges.h" |
| 42 #include "modules/mediasource/MediaSourceRegistry.h" | 42 #include "modules/mediasource/MediaSourceRegistry.h" |
| 43 #include "platform/ContentType.h" | 43 #include "platform/ContentType.h" |
| 44 #include "platform/Logging.h" | 44 #include "platform/Logging.h" |
| 45 #include "platform/MIMETypeRegistry.h" | 45 #include "platform/MIMETypeRegistry.h" |
| 46 #include "platform/RuntimeEnabledFeatures.h" |
| 46 #include "platform/TraceEvent.h" | 47 #include "platform/TraceEvent.h" |
| 47 #include "public/platform/WebMediaSource.h" | 48 #include "public/platform/WebMediaSource.h" |
| 48 #include "public/platform/WebSourceBuffer.h" | 49 #include "public/platform/WebSourceBuffer.h" |
| 49 #include "wtf/Uint8Array.h" | 50 #include "wtf/Uint8Array.h" |
| 50 #include "wtf/text/CString.h" | 51 #include "wtf/text/CString.h" |
| 51 | 52 |
| 52 using blink::WebMediaSource; | 53 using blink::WebMediaSource; |
| 53 using blink::WebSourceBuffer; | 54 using blink::WebSourceBuffer; |
| 54 | 55 |
| 55 namespace WebCore { | 56 namespace WebCore { |
| (...skipping 482 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 538 | 539 |
| 539 m_asyncEventQueue->enqueueEvent(event.release()); | 540 m_asyncEventQueue->enqueueEvent(event.release()); |
| 540 } | 541 } |
| 541 | 542 |
| 542 URLRegistry& MediaSource::registry() const | 543 URLRegistry& MediaSource::registry() const |
| 543 { | 544 { |
| 544 return MediaSourceRegistry::registry(); | 545 return MediaSourceRegistry::registry(); |
| 545 } | 546 } |
| 546 | 547 |
| 547 } // namespace WebCore | 548 } // namespace WebCore |
| OLD | NEW |