[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 dfca499793fcc2be4ecf2b9823e8be7cc91cd4ba
Author: kov at webkit.org <kov at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 16 22:28:08 2009 +0000

    Unreviewed. Rolling out r49661 since it makes tests fail on GTK+ and Mac with Xiph plugin
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@49704 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 0728cb2..e15b52a 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -128,16 +128,6 @@
 
         * platform/win/Skipped:
 
-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 24663f1..20e8235 100644
--- a/LayoutTests/media/media-file.js
+++ b/LayoutTests/media/media-file.js
@@ -1,17 +1,15 @@
-// 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