| 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 28 matching lines...) Expand all Loading... |
| 39 #include "core/platform/graphics/IntRect.h" | 39 #include "core/platform/graphics/IntRect.h" |
| 40 #include "core/platform/graphics/MediaPlayerPrivate.h" | 40 #include "core/platform/graphics/MediaPlayerPrivate.h" |
| 41 #include <wtf/text/CString.h> | 41 #include <wtf/text/CString.h> |
| 42 | 42 |
| 43 #include "core/platform/graphics/InbandTextTrackPrivate.h" | 43 #include "core/platform/graphics/InbandTextTrackPrivate.h" |
| 44 | 44 |
| 45 #if ENABLE(MEDIA_SOURCE) | 45 #if ENABLE(MEDIA_SOURCE) |
| 46 #include "MediaSource.h" | 46 #include "MediaSource.h" |
| 47 #endif | 47 #endif |
| 48 | 48 |
| 49 #include "MediaPlayerPrivateChromium.h" | 49 #include "core/platform/graphics/chromium/MediaPlayerPrivateChromium.h" |
| 50 #define PlatformMediaEngineClassName MediaPlayerPrivate | 50 #define PlatformMediaEngineClassName MediaPlayerPrivate |
| 51 | 51 |
| 52 namespace WebCore { | 52 namespace WebCore { |
| 53 | 53 |
| 54 const PlatformMedia NoPlatformMedia = { PlatformMedia::None, {0} }; | 54 const PlatformMedia NoPlatformMedia = { PlatformMedia::None, {0} }; |
| 55 | 55 |
| 56 // a null player to make MediaPlayer logic simpler | 56 // a null player to make MediaPlayer logic simpler |
| 57 | 57 |
| 58 class NullMediaPlayerPrivate : public MediaPlayerPrivateInterface { | 58 class NullMediaPlayerPrivate : public MediaPlayerPrivateInterface { |
| 59 public: | 59 public: |
| (...skipping 940 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1000 return m_private->textTrackMenu(); | 1000 return m_private->textTrackMenu(); |
| 1001 } | 1001 } |
| 1002 #endif // USE(PLATFORM_TEXT_TRACK_MENU) | 1002 #endif // USE(PLATFORM_TEXT_TRACK_MENU) |
| 1003 | 1003 |
| 1004 void MediaPlayer::resetMediaEngines() | 1004 void MediaPlayer::resetMediaEngines() |
| 1005 { | 1005 { |
| 1006 installedMediaEngines(ResetEngines); | 1006 installedMediaEngines(ResetEngines); |
| 1007 } | 1007 } |
| 1008 | 1008 |
| 1009 } | 1009 } |
| OLD | NEW |