Changeset 88318 in webkit

Timestamp:

Jun 7, 2011 7:44:35 PM (13 years ago)

Author:

yi.4.shen@nokia.com

Message:

2011-06-07 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Fix the error code for media resource failures when using QtMobility
​https://bugs.webkit.org/show_bug.cgi?id=55901

Unskip the tests which are now passing.

• platform/qt/Skipped:

2011-06-07 Yi Shen <​yi.4.shen@nokia.com>

Reviewed by Simon Hausmann.

[Qt] Fix the error code for media resource failures when using QtMobility
​https://bugs.webkit.org/show_bug.cgi?id=55901

To indicate the media resource failures, set the network state to
MediaPlayer::FormatError when receives QMediaPlayer::InvalidMedia or
QMediaPlayer::ResourceError.

• platform/graphics/qt/MediaPlayerPrivateQt.cpp: (WebCore::MediaPlayerPrivateQt::updateStates):

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/platform/qt/Skipped (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2011-06-07  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the error code for media resource failures when using QtMobility
+        https://bugs.webkit.org/show_bug.cgi?id=55901
+
+        Unskip the tests which are now passing.
+
+        * platform/qt/Skipped:
+
 2011-06-07  Gavin Barraclough  <barraclough@apple.com>
 

trunk/LayoutTests/platform/qt/Skipped

@@ -586 +586 @@
 media/video-element-other-namespace-crash.html
 media/video-empty-source.html
-media/video-error-does-not-exist.html
 media/video-layer-crash.html
 media/video-load-networkState.html
@@ -608 +607 @@
 media/video-source-type.html
 media/video-source-type-params.html
-media/video-src-change.html
-media/video-src-invalid-remove.html
-media/video-src-none.html
-media/video-src-plus-source.html
 media/video-timeupdate-during-playback.html
 media/video-timeupdate-reverse-play.html

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-07  Yi Shen  <yi.4.shen@nokia.com>
+
+        Reviewed by Simon Hausmann.
+
+        [Qt] Fix the error code for media resource failures when using QtMobility
+        https://bugs.webkit.org/show_bug.cgi?id=55901
+
+        To indicate the media resource failures, set the network state to
+        MediaPlayer::FormatError when receives QMediaPlayer::InvalidMedia or
+        QMediaPlayer::ResourceError.
+
+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
+        (WebCore::MediaPlayerPrivateQt::updateStates):
+
 2011-06-07  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp

@@ -491 +491 @@
     if (currentError != QMediaPlayer::NoError) {
         m_readyState = MediaPlayer::HaveNothing;
-        if (currentError == QMediaPlayer::FormatError)
+        if (currentError == QMediaPlayer::FormatError || currentError == QMediaPlayer::ResourceError)
             m_networkState = MediaPlayer::FormatError;
         else
@@ -516 +516 @@
         m_readyState = MediaPlayer::HaveEnoughData;
     } else if (currentStatus == QMediaPlayer::InvalidMedia) {
-        m_networkState = MediaPlayer::NetworkError;
+        m_networkState = MediaPlayer::FormatError;
         m_readyState = MediaPlayer::HaveNothing;
     }