diff options
Diffstat (limited to 'WebCore/platform/graphics/MediaPlayer.cpp')
| -rw-r--r-- | WebCore/platform/graphics/MediaPlayer.cpp | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp index 3898386..b64f82b 100644 --- a/WebCore/platform/graphics/MediaPlayer.cpp +++ b/WebCore/platform/graphics/MediaPlayer.cpp @@ -262,19 +262,11 @@ bool MediaPlayer::canLoadPoster() const { return m_private->canLoadPoster(); } -<<<<<<< HEAD:WebCore/platform/graphics/MediaPlayer.cpp - -======= ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/MediaPlayer.cpp void MediaPlayer::setPoster(const String& url) { m_private->setPoster(url); -<<<<<<< HEAD:WebCore/platform/graphics/MediaPlayer.cpp -} -======= } ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/MediaPlayer.cpp void MediaPlayer::cancelLoad() { @@ -285,11 +277,7 @@ void MediaPlayer::prepareToPlay() { m_private->prepareToPlay(); } -<<<<<<< HEAD:WebCore/platform/graphics/MediaPlayer.cpp - -======= ->>>>>>> webkit.org at 49305:WebCore/platform/graphics/MediaPlayer.cpp void MediaPlayer::play() { m_private->play(); |