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

Wed Dec 22 15:17:11 UTC 2010

The following commit has been merged in the debian/experimental branch:
commit 1a290797b05e2609877238728418d8b9a927c054
Author: eric.carlson at apple.com <eric.carlson at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 21:00:36 2010 +0000

    2010-10-29  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Adam Roben.
    
            Navigating to a .wav file creates a plugin document but should create a media document
            https://bugs.webkit.org/show_bug.cgi?id=48546
            <rdar://problem/8606105>
    
            Test: media/media-can-play-wav-audio.html
    
            * platform/MIMETypeRegistry.cpp: Add mapping from ".wav" to "audio/x-wav".
    
    2010-10-28  Eric Carlson  <eric.carlson at apple.com>
    
            Reviewed by Adam Roben.
    
            Navigating to a .wav file creates a plugin document but should create a media document
            https://bugs.webkit.org/show_bug.cgi?id=48546
            <rdar://problem/8606105>
    
            * media/media-can-play-wav-audio-expected.txt: Added.
            * media/media-can-play-wav-audio.html: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70922 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index d3f0f97..72055eb 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,14 @@
+2010-10-28  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Navigating to a .wav file creates a plugin document but should create a media document
+        https://bugs.webkit.org/show_bug.cgi?id=48546
+        <rdar://problem/8606105>
+
+        * media/media-can-play-wav-audio-expected.txt: Added.
+        * media/media-can-play-wav-audio.html: Added.
+
 2010-10-29  Mihai Parparita  <mihaip at chromium.org>
         
         Update the pixel expectations for fast/block/float for the Mac port.
diff --git a/LayoutTests/media/media-can-play-wav-audio-expected.txt b/LayoutTests/media/media-can-play-wav-audio-expected.txt
new file mode 100644
index 0000000..61fc82f
--- /dev/null
+++ b/LayoutTests/media/media-can-play-wav-audio-expected.txt
@@ -0,0 +1,6 @@
+Test HTMLMediaElement canPlayType() method with multiple .wav MIME types.
+
+EXPECTED (audio.canPlayType('audio/wav') == 'maybe') OK
+EXPECTED (audio.canPlayType('audio/x-wav') == 'maybe') OK
+END OF TEST
+
diff --git a/LayoutTests/media/media-can-play-wav-audio.html b/LayoutTests/media/media-can-play-wav-audio.html
new file mode 100644
index 0000000..94adeda
--- /dev/null
+++ b/LayoutTests/media/media-can-play-wav-audio.html
@@ -0,0 +1,25 @@
+<!doctype html>
+<html>
+    <head>
+        <script src=video-test.js></script>
+        <script>
+            function start()
+            {
+                audio = document.getElementsByTagName('audio')[0];
+
+                testExpected("audio.canPlayType('audio/wav')", "maybe");
+                testExpected("audio.canPlayType('audio/x-wav')", "maybe");
+
+                endTest();
+            }
+        </script>
+
+    </head>
+    <body onload="start()">
+
+        <audio controls ></audio>
+
+        <p>Test HTMLMediaElement <em>canPlayType()</em> method with multiple .wav MIME types.</p>
+
+    </body>
+</html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 03d8d09..5424d32 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2010-10-29  Eric Carlson  <eric.carlson at apple.com>
+
+        Reviewed by Adam Roben.
+
+        Navigating to a .wav file creates a plugin document but should create a media document
+        https://bugs.webkit.org/show_bug.cgi?id=48546
+        <rdar://problem/8606105>
+
+        Test: media/media-can-play-wav-audio.html
+
+        * platform/MIMETypeRegistry.cpp: Add mapping from ".wav" to "audio/x-wav".
+
 2010-10-29  Aaron Colwell  <acolwell at chromium.org>
 
         Reviewed by James Robinson.
diff --git a/WebCore/platform/MIMETypeRegistry.cpp b/WebCore/platform/MIMETypeRegistry.cpp
index ca98f9b..337463d 100644
--- a/WebCore/platform/MIMETypeRegistry.cpp
+++ b/WebCore/platform/MIMETypeRegistry.cpp
@@ -311,7 +311,10 @@ static MediaMIMETypeMap& mediaMIMETypeMap()
 
         // CoreAudio File
         { "audio/x-caf", "caf" },
-        { "audio/x-gsm", "gsm" }
+        { "audio/x-gsm", "gsm" },
+
+        // ADPCM
+        { "audio/x-wav", "wav" }
     };
 
     DEFINE_STATIC_LOCAL(MediaMIMETypeMap, mediaMIMETypeForExtensionMap, ());

-- 
WebKit Debian packaging

