Attachment 84977 Details for Bug 55901 – proposed fix

[patch] proposed fix

55901.patch (text/plain), 4.33 KB, created by Yi Shen on 2011-03-07 13:49:08 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Yi Shen

Created: 2011-03-07 13:49:08 PST

Size: 4.33 KB

patch

obsolete

>Index: Source/WebCore/ChangeLog
>===================================================================
>--- Source/WebCore/ChangeLog	(revision 80491)
>+++ Source/WebCore/ChangeLog	(working copy)
>@@ -1,3 +1,24 @@
>+2011-03-07  Yi Shen  <yi.4.shen@nokia.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [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 netwrok state to
>+        MediaPlayer::FormatError when receives QMediaPlayer::InvalidMedia.
>+
>+        Tests: media/invalid-media-url-crash.html
>+               media/media-constants.html
>+               media/video-error-does-not-exist.html
>+               media/video-src-change.html
>+               media/video-src-invalid-remove.html
>+               media/video-src-none.html
>+               media/video-src-plus-source.html
>+
>+        * platform/graphics/qt/MediaPlayerPrivateQt.cpp:
>+        (WebCore::MediaPlayerPrivateQt::updateStates):
>+
> 2011-03-07  Takayoshi Kochi  <kochi@chromium.org>
> 
>         Reviewed by Tony Chang.
>Index: Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp
>===================================================================
>--- Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp	(revision 80487)
>+++ Source/WebCore/platform/graphics/qt/MediaPlayerPrivateQt.cpp	(working copy)
>@@ -532,7 +532,7 @@ void MediaPlayerPrivateQt::updateStates(
>         m_readyState = MediaPlayer::HaveNothing;
>         if (currentError == QMediaPlayer::FormatError)
>             m_networkState = MediaPlayer::FormatError;
>-        else
>+        else if (m_networkState != MediaPlayer::FormatError)
>             m_networkState = MediaPlayer::NetworkError;
>     } else if (currentStatus == QMediaPlayer::UnknownMediaStatus
>                || currentStatus == QMediaPlayer::NoMedia) {
>@@ -555,7 +555,7 @@ void MediaPlayerPrivateQt::updateStates(
>         m_networkState = MediaPlayer::Loaded;
>         m_readyState = MediaPlayer::HaveEnoughData;
>     } else if (currentStatus == QMediaPlayer::InvalidMedia) {
>-        m_networkState = MediaPlayer::NetworkError;
>+        m_networkState = MediaPlayer::FormatError;
>         m_readyState = MediaPlayer::HaveNothing;
>     }
> 
>Index: LayoutTests/ChangeLog
>===================================================================
>--- LayoutTests/ChangeLog	(revision 80491)
>+++ LayoutTests/ChangeLog	(working copy)
>@@ -1,3 +1,14 @@
>+2011-03-07  Yi Shen  <yi.4.shen@nokia.com>
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        [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-03-07  Mihai Parparita  <mihaip@chromium.org>
> 
>         Unreviewed Chromium expectations update.
>Index: LayoutTests/platform/qt/Skipped
>===================================================================
>--- LayoutTests/platform/qt/Skipped	(revision 80487)
>+++ LayoutTests/platform/qt/Skipped	(working copy)
>@@ -562,8 +562,6 @@ http/tests/inspector/resource-parameters
> # https://bugs.webkit.org/show_bug.cgi?id=38376
> media/media-document-audio-size.html
> 
>-media/invalid-media-url-crash.html
>-
> # [Qt] media/media-can-play-ogg.html crashes intermittently on the bot
> # https://bugs.webkit.org/show_bug.cgi?id=39481
> media/audio-only-video-intrinsic-size.html
>@@ -597,7 +595,6 @@ media/controls-styling.html
> media/event-attributes.html
> media/fallback.html
> media/media-captions.html
>-media/media-constants.html
> media/media-fullscreen-inline.html
> media/media-fullscreen-not-in-document.html
> media/media-load-event.html
>@@ -633,7 +630,6 @@ media/video-dom-src.html
> media/video-duration-known-after-eos.html
> 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
> media/video-load-readyState.html
>@@ -668,11 +664,7 @@ media/video-source-media.html
> media/video-source-none-supported.html
> media/video-source-type.html
> media/video-source-type-params.html
>-media/video-src-change.html
> media/video-src.html
>-media/video-src-invalid-remove.html
>-media/video-src-none.html
>-media/video-src-plus-source.html
> media/video-src-remove.html
> media/video-src-set.html
> media/video-src-source.html

Flags:

hausmann: review+
hausmann: commit-queue-

Actions: View | Formatted Diff | Diff

Attachments on bug 55901: 84977 | 91298 | 96331