[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kov at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 7f28ef06de73dcfc6e24e9fc307f556313a4bdf0
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Sep 24 17:55:36 2009 +0000

    WebCore
    
    2009-09-24  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            [GTK] re-enable some media tests
            https://bugs.webkit.org/show_bug.cgi?id=29716
    
            make canPlayType() return "probably" if mime-type is known
            and codecs string is not empty. If codecs is empty return
            "maybe".
    
            * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
            (WebCore::MediaPlayerPrivate::supportsType):
    
    LayoutTests
    
    2009-09-24  Philippe Normand  <pnormand at igalia.com>
    
            Reviewed by Gustavo Noronha.
    
            [GTK] re-enable some media tests
            https://bugs.webkit.org/show_bug.cgi?id=29716
    
            * platform/gtk/Skipped:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48724 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 45687ce..167e0c0 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2009-09-24  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] re-enable some media tests
+        https://bugs.webkit.org/show_bug.cgi?id=29716
+
+        * platform/gtk/Skipped:
+
 2009-09-24  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/LayoutTests/platform/gtk/Skipped b/LayoutTests/platform/gtk/Skipped
index 9161e6b..ab2dd0b 100644
--- a/LayoutTests/platform/gtk/Skipped
+++ b/LayoutTests/platform/gtk/Skipped
@@ -3812,17 +3812,9 @@ http/tests/webarchive/test-preload-resources.html
 
 # Tests in media/ directory
 #   Tests failing
-media/video-append-source.html
-media/video-autoplay.html
-media/video-buffered.html
-media/video-can-play-type.html
-media/video-click-dblckick-standalone.html
 media/video-controls-transformed.html
 media/video-controls-zoomed.html
-media/video-document-types.html
-media/video-played-reset.html
 media/video-size-intrinsic-scale.html
-media/video-source-error.html
 #   Tests timing out
 media/audio-data-url.html
 media/controls-drag-timebar.html
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2a69ff7..7b8f41d 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-09-24  Philippe Normand  <pnormand at igalia.com>
+
+        Reviewed by Gustavo Noronha.
+
+        [GTK] re-enable some media tests
+        https://bugs.webkit.org/show_bug.cgi?id=29716
+
+        make canPlayType() return "probably" if mime-type is known
+        and codecs string is not empty. If codecs is empty return
+        "maybe".
+
+        * platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp:
+        (WebCore::MediaPlayerPrivate::supportsType):
+
 2009-09-24  Sam Weinig  <sam at webkit.org>
 
         Reviewed by Dan Bernstein.
diff --git a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
index 3737053..00d8242 100644
--- a/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
+++ b/WebCore/platform/graphics/gtk/MediaPlayerPrivateGStreamer.cpp
@@ -750,8 +750,9 @@ MediaPlayer::SupportsType MediaPlayerPrivate::supportsType(const String& type, c
     if (type.isNull() || type.isEmpty())
         return MediaPlayer::IsNotSupported;
 
+    // spec says we should not return "probably" if the codecs string is empty
     if (mimeTypeCache().contains(type))
-        return !codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported;
+        return codecs.isEmpty() ? MediaPlayer::MayBeSupported : MediaPlayer::IsSupported;
     return MediaPlayer::IsNotSupported;
 }
 

-- 
WebKit Debian packaging