[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[eric.carlson at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 8ef1babb35b84b60c4302873095fd4d5ac335319
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Aug 31 21:51:45 2010 +0000

    2010-08-31  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Darin Adler.
    
            canPlayType("application/octet-stream") must return ""
            https://bugs.webkit.org/show_bug.cgi?id=44985
    
            * platform/graphics/MediaPlayer.cpp:
            (WebCore::MediaPlayer::supportsType): Always return IsNotSupported for application/octet-stream
    
    2010-08-31  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Darin Adler.
    
            canPlayType("application/octet-stream") must return ""
            https://bugs.webkit.org/show_bug.cgi?id=44985
    
            * media/media-can-play-octet-stream-expected.txt:
            * media/media-can-play-octet-stream.html:
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@66541 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1db26dc..b305234 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-31  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Darin Adler.
+
+        canPlayType("application/octet-stream") must return ""
+        https://bugs.webkit.org/show_bug.cgi?id=44985
+
+        * media/media-can-play-octet-stream-expected.txt:
+        * media/media-can-play-octet-stream.html:
+
 2010-08-31  Darin Adler  <darin at apple.com>
 
         Reviewed by Anders Carlsson.
diff --git a/LayoutTests/media/media-can-play-octet-stream-expected.txt b/LayoutTests/media/media-can-play-octet-stream-expected.txt
index 34f9935..c1bdd59 100644
--- a/LayoutTests/media/media-can-play-octet-stream-expected.txt
+++ b/LayoutTests/media/media-can-play-octet-stream-expected.txt
@@ -1,12 +1,12 @@
 Test HTMLMediaElement canPlayType() method with "application/octet-stream".
 
 ++ Test with <video> element.
-EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == 'maybe') OK
+EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == '') OK
 EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK
 EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=mp4') == '') OK
 
 ++ Test with <audio> element.
-EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == 'maybe') OK
+EXPECTED (mediaElement.canPlayType('APPLICATION/octet-stream') == '') OK
 EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=theora') == '') OK
 EXPECTED (mediaElement.canPlayType('application/octet-stream;codecs=mp4') == '') OK
 END OF TEST
diff --git a/LayoutTests/media/media-can-play-octet-stream.html b/LayoutTests/media/media-can-play-octet-stream.html
index 375f6ca..bc6fc39 100644
--- a/LayoutTests/media/media-can-play-octet-stream.html
+++ b/LayoutTests/media/media-can-play-octet-stream.html
@@ -9,7 +9,7 @@
         <script>
             function test()
             {
-                testExpected("mediaElement.canPlayType('APPLICATION/octet-stream')", "maybe");
+                testExpected("mediaElement.canPlayType('APPLICATION/octet-stream')", "");
                 testExpected("mediaElement.canPlayType('application/octet-stream;codecs=theora')", "");
                 testExpected("mediaElement.canPlayType('application/octet-stream;codecs=mp4')", "");
              }
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 1232018..78770d9 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2010-08-31  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Darin Adler.
+
+        canPlayType("application/octet-stream") must return ""
+        https://bugs.webkit.org/show_bug.cgi?id=44985
+
+        * platform/graphics/MediaPlayer.cpp:
+        (WebCore::MediaPlayer::supportsType): Always return IsNotSupported for application/octet-stream
+
 2010-08-31  Martin Robinson  <mrobinson at igalia.com>
 
         Reviewed by Gustavo Noronha Silva.
diff --git a/WebCore/platform/graphics/MediaPlayer.cpp b/WebCore/platform/graphics/MediaPlayer.cpp
index 36d9a87..94c7e14 100644
--- a/WebCore/platform/graphics/MediaPlayer.cpp
+++ b/WebCore/platform/graphics/MediaPlayer.cpp
@@ -559,17 +559,10 @@ MediaPlayer::SupportsType MediaPlayer::supportsType(ContentType contentType)
     String type = contentType.type().lower();
     String typeCodecs = contentType.parameter(codecs());
 
-    // 4.8.10.3 MIME types - In the absence of a specification to the contrary, the MIME type "application/octet-stream" 
-    // when used with parameters, e.g. "application/octet-stream;codecs=theora", is a type that the user agent knows 
-    // it cannot render.
-    if (type == applicationOctetStream()) {
-        if (!typeCodecs.isEmpty())
-            return IsNotSupported;
-        
-        // The MIME type "application/octet-stream" with no parameters is never a type that the user agent knows it 
-        // cannot render.
-        return MayBeSupported;
-    }
+    // 4.8.10.3 MIME types - The canPlayType(type) method must return the empty string if type is a type that the 
+    // user agent knows it cannot render or is the type "application/octet-stream"
+    if (type == applicationOctetStream())
+        return IsNotSupported;
 
     MediaPlayerFactory* engine = chooseBestEngineForTypeAndCodecs(type, typeCodecs);
     if (!engine)

-- 
WebKit Debian packaging