Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge r155104 - [Qt][WK1] REGRESSION(r154988): compositing/video/vide…
…o-with-invalid-source.html https://bugs.webkit.org/show_bug.cgi?id=120683 Patch by Andre Moreira Magalhaes <andre.magalhaes@collabora.co.uk> on 2013-09-05 Reviewed by Philippe Normand. Do not set pipeline state to NULL on MediaPlayerPrivateGStreamer::loadingFailed() otherwise the bus is flushed and we never get a GST_MESSAGE_ERROR when failing to load uris. Also restore previous behaviour (before r154988) of not invoking loadingFailed() for all failed manual state change attempts. * platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp: (WebCore::MediaPlayerPrivateGStreamer::changePipelineState): Do not call loadingFailed() if state change fails as all manual state changes are now done with changePipelineState(). (WebCore::MediaPlayerPrivateGStreamer::play): (WebCore::MediaPlayerPrivateGStreamer::pause): (WebCore::MediaPlayerPrivateGStreamer::seek): (WebCore::MediaPlayerPrivateGStreamer::handleMessage): Restore previous behaviour (before changeset r154988) when calling changePipelineState(). (WebCore::MediaPlayerPrivateGStreamer::updateStates): Do nothing if changing to READY on EOS (same behaviour as setting to NULL as it was before changeset r154988). (WebCore::MediaPlayerPrivateGStreamer::loadingFailed): Do not set pipeline state to NULL so we properly get GST_MESSAGE_ERROR on loading failures.
- Loading branch information
1 parent
c7acf38
commit 81c5857
Showing
2 changed files
with
44 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters