Merge WebKit at r63173 : Initial merge by git.

Change-Id: Ife5af0c7c6261fbbc8ae6bc08c390efa9ef10b44

1 files changed, 5 insertions, 5 deletions

diff --git a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
index 4d7b7b0..525aaf4 100644
--- a/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
+++ b/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
@@ -77,7 +77,7 @@ MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& mime, c
     if (!mime.startsWith("audio/") && !mime.startsWith("video/"))
         return MediaPlayer::IsNotSupported;
 
-    if (QMediaPlayer::hasSupport(mime, QStringList(codec)) >= QtMediaServices::ProbablySupported)
+    if (QMediaPlayer::hasSupport(mime, QStringList(codec)) >= QtMultimediaKit::ProbablySupported)
         return MediaPlayer::IsSupported;
 
     return MediaPlayer::MayBeSupported;
@@ -96,7 +96,7 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
     , m_composited(false)
     , m_queuedSeek(-1)
 {
-    m_videoItem->setMediaObject(m_mediaPlayer);
+    m_mediaPlayer->bind(m_videoItem);
     m_videoScene->addItem(m_videoItem);
 
     // Signal Handlers
@@ -123,7 +123,7 @@ MediaPlayerPrivate::MediaPlayerPrivate(MediaPlayer* player)
     QMediaService* service = m_mediaPlayer->service();
     if (service) {
         m_mediaPlayerControl = qobject_cast<QMediaPlayerControl *>(
-                service->control(QMediaPlayerControl_iid));
+                service->requestControl(QMediaPlayerControl_iid));
     }
 }
 
@@ -344,8 +344,8 @@ unsigned MediaPlayerPrivate::bytesLoaded() const
 
 unsigned MediaPlayerPrivate::totalBytes() const
 {
-    if (m_mediaPlayer->availableMetaData().contains(QtMediaServices::Size))
-        return m_mediaPlayer->metaData(QtMediaServices::Size).toInt();
+    if (m_mediaPlayer->availableMetaData().contains(QtMultimediaKit::Size))
+        return m_mediaPlayer->metaData(QtMultimediaKit::Size).toInt();
 
     return 100;
 }