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

atwilson at chromium.org atwilson at chromium.org
Wed Dec 22 13:35:18 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 708afd240b4c7756a86d0fa7c3f71bf13894791d
Author: atwilson at chromium.org <atwilson at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 21 00:18:03 2010 +0000

    Revert r67892 (expectations update) as the expectations are out-of-date due to r67879.
    
    * Scripts/webkitpy/layout_tests/port/base.py:
    * platform/chromium-mac/fast/repaint/table-cell-move-expected.checksum: Removed.
    * platform/chromium-mac/fast/repaint/table-cell-move-expected.png: Removed.
    * platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.checksum: Removed.
    * platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.png: Removed.
    * platform/chromium-win/fast/repaint/table-cell-move-expected.checksum:
    * platform/chromium-win/fast/repaint/table-cell-move-expected.png:
    * platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.checksum:
    * platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.png:
    * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67897 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 1b5cb90..a8de138 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,19 @@
 2010-09-20  Andrew Wilson  <atwilson at chromium.org>
 
+        Revert r67892 (expectations update) as the expectations are out-of-date due to r67879.
+
+        * platform/chromium-mac/fast/repaint/table-cell-move-expected.checksum: Removed.
+        * platform/chromium-mac/fast/repaint/table-cell-move-expected.png: Removed.
+        * platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.checksum: Removed.
+        * platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.png: Removed.
+        * platform/chromium-win/fast/repaint/table-cell-move-expected.checksum:
+        * platform/chromium-win/fast/repaint/table-cell-move-expected.png:
+        * platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.checksum:
+        * platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.png:
+        * platform/chromium/test_expectations.txt:
+
+2010-09-20  Andrew Wilson  <atwilson at chromium.org>
+
         Unreviewed expectations update for chromium.
 
         * platform/chromium-mac/fast/repaint/table-cell-move-expected.checksum: Added.
diff --git a/LayoutTests/platform/chromium-mac/fast/repaint/table-cell-move-expected.checksum b/LayoutTests/platform/chromium-mac/fast/repaint/table-cell-move-expected.checksum
deleted file mode 100644
index a5eb56f..0000000
--- a/LayoutTests/platform/chromium-mac/fast/repaint/table-cell-move-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-e013eaf2dd7af5bf116433c80e75af2f
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/repaint/table-cell-move-expected.png b/LayoutTests/platform/chromium-mac/fast/repaint/table-cell-move-expected.png
deleted file mode 100644
index 2aa3c9b..0000000
Binary files a/LayoutTests/platform/chromium-mac/fast/repaint/table-cell-move-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.checksum b/LayoutTests/platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.checksum
deleted file mode 100644
index 9f8f199..0000000
--- a/LayoutTests/platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.checksum
+++ /dev/null
@@ -1 +0,0 @@
-ef6f4a6b6eda397ea3d2e7805ab9838b
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.png b/LayoutTests/platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.png
deleted file mode 100644
index cb37973..0000000
Binary files a/LayoutTests/platform/chromium-mac/fast/repaint/table-extra-bottom-grow-expected.png and /dev/null differ
diff --git a/LayoutTests/platform/chromium-win/fast/repaint/table-cell-move-expected.checksum b/LayoutTests/platform/chromium-win/fast/repaint/table-cell-move-expected.checksum
index d663a12..a78bb95 100644
--- a/LayoutTests/platform/chromium-win/fast/repaint/table-cell-move-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/repaint/table-cell-move-expected.checksum
@@ -1 +1 @@
-1536953cea604b81b8935c65080ddad8
\ No newline at end of file
+457129b985f2ba93b95b7077e624a1c7
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/repaint/table-cell-move-expected.png b/LayoutTests/platform/chromium-win/fast/repaint/table-cell-move-expected.png
index 1770e07..b7bed28 100644
Binary files a/LayoutTests/platform/chromium-win/fast/repaint/table-cell-move-expected.png and b/LayoutTests/platform/chromium-win/fast/repaint/table-cell-move-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.checksum b/LayoutTests/platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.checksum
index b9317e7..10b021b 100644
--- a/LayoutTests/platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.checksum
+++ b/LayoutTests/platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.checksum
@@ -1 +1 @@
-4445b18bc14d9313b993132c7aad3200
\ No newline at end of file
+9b97a1bea11acbe1798d5fe199151961
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.png b/LayoutTests/platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.png
index 28be965..12f7181 100644
Binary files a/LayoutTests/platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.png and b/LayoutTests/platform/chromium-win/fast/repaint/table-extra-bottom-grow-expected.png differ
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 228cf57..f16b0b9 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -3181,5 +3181,3 @@ BUGWEBGL WIN LINUX : fast/canvas/webgl/uniform-location.html = TEXT
 // Pre-HTML5 parser quirks only apply to the mac port for now.
 WONTFIX SKIP : fast/parser/pre-html5-parser-quirks.html = FAIL
 
-// Failing after 67748:67845 roll
-BUG56277 : canvas/philip/tests/2d.imageData.get.source.outside.html = FAIL
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3bda658..2701c7d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,9 @@
+2010-09-20  Andrew Wilson  <atwilson at chromium.org>
+
+        Revert change which was accidentally committed along with some expectation changes.
+
+        * Scripts/webkitpy/layout_tests/port/base.py:
+
 2010-09-20  Mihai Parparita  <mihaip at chromium.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index 2f61aba..c21c889 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -350,6 +350,7 @@ class Port(object):
         """Relative unix-style path for a filename under the LayoutTests
         directory. Filenames outside the LayoutTests directory should raise
         an error."""
+        assert(filename.startswith(self.layout_tests_dir()))
         return filename[len(self.layout_tests_dir()) + 1:]
 
     def results_directory(self):

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list