| OLD | NEW |
| 1 /* | 1 /* |
| 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights
reserved. | 2 * Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple 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 13 matching lines...) Expand all Loading... |
| 24 */ | 24 */ |
| 25 | 25 |
| 26 #include "config.h" | 26 #include "config.h" |
| 27 | 27 |
| 28 #include "core/platform/graphics/MediaPlayer.h" | 28 #include "core/platform/graphics/MediaPlayer.h" |
| 29 | 29 |
| 30 #include "core/dom/Document.h" | 30 #include "core/dom/Document.h" |
| 31 #include "core/html/TimeRanges.h" | 31 #include "core/html/TimeRanges.h" |
| 32 #include "core/page/Frame.h" | 32 #include "core/page/Frame.h" |
| 33 #include "core/page/FrameView.h" | 33 #include "core/page/FrameView.h" |
| 34 #include "core/page/Settings.h" | |
| 35 #include "core/platform/ContentType.h" | 34 #include "core/platform/ContentType.h" |
| 36 #include "core/platform/Logging.h" | |
| 37 #include "core/platform/MIMETypeFromURL.h" | 35 #include "core/platform/MIMETypeFromURL.h" |
| 38 #include "core/platform/MIMETypeRegistry.h" | 36 #include "core/platform/MIMETypeRegistry.h" |
| 39 #include "core/platform/graphics/IntRect.h" | 37 #include "core/platform/graphics/IntRect.h" |
| 40 #include "core/platform/graphics/MediaPlayerPrivate.h" | 38 #include "core/platform/graphics/MediaPlayerPrivate.h" |
| 41 #include "modules/mediasource/WebKitMediaSource.h" | 39 #include "modules/mediasource/WebKitMediaSource.h" |
| 42 #include <wtf/text/CString.h> | 40 #include <wtf/text/CString.h> |
| 43 | 41 |
| 44 #include "core/platform/graphics/InbandTextTrackPrivate.h" | 42 #include "core/platform/graphics/InbandTextTrackPrivate.h" |
| 45 | 43 |
| 46 #include "core/platform/graphics/chromium/MediaPlayerPrivateChromium.h" | 44 #include "core/platform/graphics/chromium/MediaPlayerPrivateChromium.h" |
| (...skipping 784 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 { | 829 { |
| 832 return m_private->requiresTextTrackRepresentation(); | 830 return m_private->requiresTextTrackRepresentation(); |
| 833 } | 831 } |
| 834 | 832 |
| 835 void MediaPlayer::setTextTrackRepresentation(TextTrackRepresentation* representa
tion) | 833 void MediaPlayer::setTextTrackRepresentation(TextTrackRepresentation* representa
tion) |
| 836 { | 834 { |
| 837 m_private->setTextTrackRepresentation(representation); | 835 m_private->setTextTrackRepresentation(representation); |
| 838 } | 836 } |
| 839 | 837 |
| 840 } | 838 } |
| OLD | NEW |