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

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 2284f1876fc9b3b5a9f780e5f7d59419f6411884
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 15 21:53:16 2009 +0000

    2009-10-15  Andrew Scherkus  <scherkus at chromium.org>
    
            Reviewed by Darin Adler.
    
            Fix media layout test file ordering so both branded and unbranded builds of Chromium will pass layout tests.
    
            https://bugs.webkit.org/show_bug.cgi?id=30369
    
            * media/media-file.js: Fixed file ordering.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49661 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 600ae66..1b2df18 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2009-10-15  Andrew Scherkus  <scherkus at chromium.org>
+
+        Reviewed by Darin Adler.
+
+        Fix media layout test file ordering so both branded and unbranded builds of Chromium will pass layout tests.
+
+        https://bugs.webkit.org/show_bug.cgi?id=30369
+
+        * media/media-file.js: Fixed file ordering.
+
 2009-10-15  Pavel Feldman  <pfeldman at chromium.org>
 
         Reviewed by Timothy Hatcher.
diff --git a/LayoutTests/media/media-file.js b/LayoutTests/media/media-file.js
index 20e8235..24663f1 100644
--- a/LayoutTests/media/media-file.js
+++ b/LayoutTests/media/media-file.js
@@ -1,15 +1,17 @@
+// Ogg is placed first out of convenience for Chromium developers since
+// their baselines are computed using Ogg.
 var audioCodecs = [
+    ["audio/ogg", "oga"],
     ["audio/wav", "wav"],
     ["audio/aac", "m4a"],
     ["audio/mpeg", "mp3"],
-    ["audio/ogg", "oga"]
 ];
 
 var videoCodecs = [
+    ["video/ogg", "ogv"],
     ["video/mp4", "mp4"],
     ["video/mpeg", "mpg"],
     ["video/quicktime", "mov"],
-    ["video/ogg", "ogv"]
 ];
 
 function findMediaFile(tagName, name) {

-- 
WebKit Debian packaging