[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[dglazkov at chromium.org]

The following commit has been merged in the webkit-1.3 branch:
commit 0c2fdd1faf01170a06532789cb96e7f896c7f23d
Author: dglazkov at chromium.org <dglazkov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 2 00:12:04 2011 +0000

    2011-02-01  Dimitri Glazkov  <dglazkov at chromium.org>
    
            Updated text expectations to avoid conflict.
    
            * platform/chromium/test_expectations.txt: Tweaked.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@77332 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 3e839ce..95f9f42 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,9 @@
+2011-02-01  Dimitri Glazkov  <dglazkov at chromium.org>
+
+        Updated text expectations to avoid conflict.
+
+        * platform/chromium/test_expectations.txt: Tweaked.
+
 2011-02-01  Johnny Ding  <jnd at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 8034d69..6cb31f9 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2496,13 +2496,13 @@ BUGWEBGL : fast/canvas/webgl/read-pixels-test.html = TIMEOUT
 // These three failures are due to Mesa bugs
 BUGWEBGL : fast/canvas/webgl/gl-uniform-arrays.html = TEXT TIMEOUT
 BUGWEBGL : fast/canvas/webgl/point-size.html = TEXT
-BUGWEBGL : fast/canvas/webgl/gl-object-get-calls.html = TEXT
+BUGWEBGL MAC LINUX : fast/canvas/webgl/gl-object-get-calls.html = TEXT
 
 // Failing after r75175
 BUGWEBGL : fast/canvas/webgl/glsl-conformance.html = CRASH
 
 // These were not fixed by the Mesa 7.9 upgrade. Need to investigate.
-BUGCR60651 WIN : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT PASS
+BUGCR60651 WIN : fast/canvas/webgl/gl-object-get-calls.html = TIMEOUT PASS TEXT
 // BUGCR60651 WIN : fast/canvas/webgl/glsl-conformance.html = TIMEOUT FAIL
 BUGCR60651 WIN : fast/canvas/webgl/uniform-location.html = TIMEOUT CRASH
 BUGCR60651 LINUX MAC : fast/canvas/webgl/uniform-location.html = TEXT

-- 
WebKit Debian packaging