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

ajwong at chromium.org ajwong at chromium.org
Wed Dec 22 14:20:42 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit c7b6bde46b7701c732d9007b2eab0cf40671de64
Author: ajwong at chromium.org <ajwong at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Oct 6 22:28:44 2010 +0000

    [chromium] Unreviewed. Rebaseline more tests.
    
    Linux having similar SVG failures to windows. Revision r69226 added
    http/tests/appcache/main-resource-redirect.html which does not work
    on chromium yet.
    
    * platform/chromium-linux/fast/blockflow/fieldsets-expected.checksum: Added.
    * platform/chromium-linux/fast/blockflow/fieldsets-expected.png: Added.
    * platform/chromium-linux/svg/filters/feDisplacementMap-expected.checksum: Copied from LayoutTests/platform/chromium-win/svg/filters/feDisplacementMap-expected.checksum.
    * platform/chromium-linux/svg/filters/feDisplacementMap-expected.png: Copied from LayoutTests/platform/chromium-win/svg/filters/feDisplacementMap-expected.png.
    * platform/chromium-win/fast/blockflow/fieldsets-expected.checksum: Added.
    * platform/chromium-win/fast/blockflow/fieldsets-expected.png: Added.
    * platform/chromium-win/fast/blockflow/fieldsets-expected.txt: Added.
    * platform/chromium/test_expectations.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@69241 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index a0db19b..5d8a46f 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-10-06  Albert J. Wong  <ajwong at chromium.org>
+
+        [chromium] Unreviewed. Rebaseline more tests.
+
+        Linux having similar SVG failures to windows. Revision r69226 added
+        http/tests/appcache/main-resource-redirect.html which does not work
+        on chromium yet.
+
+        * platform/chromium-linux/fast/blockflow/fieldsets-expected.checksum: Added.
+        * platform/chromium-linux/fast/blockflow/fieldsets-expected.png: Added.
+        * platform/chromium-linux/svg/filters/feDisplacementMap-expected.checksum: Copied from LayoutTests/platform/chromium-win/svg/filters/feDisplacementMap-expected.checksum.
+        * platform/chromium-linux/svg/filters/feDisplacementMap-expected.png: Copied from LayoutTests/platform/chromium-win/svg/filters/feDisplacementMap-expected.png.
+        * platform/chromium-win/fast/blockflow/fieldsets-expected.checksum: Added.
+        * platform/chromium-win/fast/blockflow/fieldsets-expected.png: Added.
+        * platform/chromium-win/fast/blockflow/fieldsets-expected.txt: Added.
+        * platform/chromium/test_expectations.txt:
+
 2010-10-06  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by Beth Dakin.
diff --git a/LayoutTests/platform/chromium-linux/fast/blockflow/fieldsets-expected.checksum b/LayoutTests/platform/chromium-linux/fast/blockflow/fieldsets-expected.checksum
new file mode 100644
index 0000000..2b600e5
--- /dev/null
+++ b/LayoutTests/platform/chromium-linux/fast/blockflow/fieldsets-expected.checksum
@@ -0,0 +1 @@
+92d2acf7e8aaebae26ed1303a2149155
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-linux/fast/blockflow/fieldsets-expected.png b/LayoutTests/platform/chromium-linux/fast/blockflow/fieldsets-expected.png
new file mode 100644
index 0000000..234689d
Binary files /dev/null and b/LayoutTests/platform/chromium-linux/fast/blockflow/fieldsets-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/svg/filters/feDisplacementMap-expected.checksum b/LayoutTests/platform/chromium-linux/svg/filters/feDisplacementMap-expected.checksum
similarity index 100%
copy from LayoutTests/platform/chromium-win/svg/filters/feDisplacementMap-expected.checksum
copy to LayoutTests/platform/chromium-linux/svg/filters/feDisplacementMap-expected.checksum
diff --git a/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.checksum b/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.checksum
new file mode 100644
index 0000000..7072cc4
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.checksum
@@ -0,0 +1 @@
+68e4b8f5516082989629e9c874556f02
\ No newline at end of file
diff --git a/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.png b/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.png
new file mode 100644
index 0000000..fea4394
Binary files /dev/null and b/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.png differ
diff --git a/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.txt b/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.txt
new file mode 100644
index 0000000..612ea6e
--- /dev/null
+++ b/LayoutTests/platform/chromium-win/fast/blockflow/fieldsets-expected.txt
@@ -0,0 +1,77 @@
+layer at (0,0) size 785x1250
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1250
+  RenderBlock {HTML} at (0,0) size 785x1250
+    RenderBody {BODY} at (8,8) size 769x1234
+      RenderText {#text} at (0,0) size 262x19
+        text run at (0,0) width 262: "LTR fieldset with left/center/right text-align: "
+      RenderBR {BR} at (262,15) size 0x0
+      RenderFieldSet {FIELDSET} at (16,36) size 228x119 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (34,0) size 104x25
+          RenderBlock {DIV} at (2,0) size 100x25 [bgcolor=#FFA500]
+      RenderText {#text} at (260,156) size 4x19
+        text run at (260,156) width 4: " "
+      RenderFieldSet {FIELDSET} at (280,36) size 228x119 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (110,0) size 104x25
+          RenderBlock {DIV} at (2,0) size 100x25 [bgcolor=#FFA500]
+      RenderText {#text} at (0,0) size 0x0
+      RenderFieldSet {FIELDSET} at (16,192) size 228x119 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (62,0) size 104x25
+          RenderBlock {DIV} at (2,0) size 100x25 [bgcolor=#FFA500]
+      RenderText {#text} at (260,312) size 4x19
+        text run at (260,312) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderText {#text} at (0,332) size 262x19
+        text run at (0,332) width 262: "RTL fieldset with left/center/right text-align: "
+      RenderBR {BR} at (262,347) size 0x0
+      RenderFieldSet {FIELDSET} at (16,368) size 228x119 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (14,0) size 104x25
+          RenderBlock {DIV} at (2,0) size 100x25 [bgcolor=#FFA500]
+      RenderText {#text} at (260,488) size 4x19
+        text run at (260,488) width 4: " "
+      RenderFieldSet {FIELDSET} at (280,368) size 228x119 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (90,0) size 104x25
+          RenderBlock {DIV} at (2,0) size 100x25 [bgcolor=#FFA500]
+      RenderText {#text} at (0,0) size 0x0
+      RenderFieldSet {FIELDSET} at (16,524) size 228x119 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (62,0) size 104x25
+          RenderBlock {DIV} at (2,0) size 100x25 [bgcolor=#FFA500]
+      RenderText {#text} at (260,644) size 4x19
+        text run at (260,644) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderText {#text} at (0,664) size 313x19
+        text run at (0,664) width 313: "Vertical LTR fieldset with left/center/right text-align: "
+      RenderBR {BR} at (313,679) size 0x0
+      RenderFieldSet {FIELDSET} at (16,700) size 119x228 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (0,34) size 25x104
+          RenderBlock {DIV} at (0,2) size 25x100 [bgcolor=#FFA500]
+      RenderText {#text} at (151,929) size 4x19
+        text run at (151,929) width 4: " "
+      RenderFieldSet {FIELDSET} at (171,700) size 119x228 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (0,110) size 25x104
+          RenderBlock {DIV} at (0,2) size 25x100 [bgcolor=#FFA500]
+      RenderText {#text} at (306,929) size 4x19
+        text run at (306,929) width 4: " "
+      RenderFieldSet {FIELDSET} at (326,700) size 119x228 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (0,62) size 25x104
+          RenderBlock {DIV} at (0,2) size 25x100 [bgcolor=#FFA500]
+      RenderText {#text} at (461,929) size 4x19
+        text run at (461,929) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderText {#text} at (0,949) size 313x19
+        text run at (0,949) width 313: "Vertical RTL fieldset with left/center/right text-align: "
+      RenderBR {BR} at (313,964) size 0x0
+      RenderFieldSet {FIELDSET} at (16,985) size 119x228 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (0,14) size 25x104
+          RenderBlock {DIV} at (0,2) size 25x100 [bgcolor=#FFA500]
+      RenderText {#text} at (151,1214) size 4x19
+        text run at (151,1214) width 4: " "
+      RenderFieldSet {FIELDSET} at (171,985) size 119x228 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (0,90) size 25x104
+          RenderBlock {DIV} at (0,2) size 25x100 [bgcolor=#FFA500]
+      RenderText {#text} at (306,1214) size 4x19
+        text run at (306,1214) width 4: " "
+      RenderFieldSet {FIELDSET} at (326,985) size 119x228 [border: (2px groove #C0C0C0)]
+        RenderBlock {LEGEND} at (0,62) size 25x104
+          RenderBlock {DIV} at (0,2) size 25x100 [bgcolor=#FFA500]
+      RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/chromium/test_expectations.txt b/LayoutTests/platform/chromium/test_expectations.txt
index 5d63ab0..aac31da 100644
--- a/LayoutTests/platform/chromium/test_expectations.txt
+++ b/LayoutTests/platform/chromium/test_expectations.txt
@@ -2281,7 +2281,7 @@ BUG32195 WIN : fast/repaint/renderer-destruction-by-invalidateSelection-crash.ht
 
 // Expectations from roll to 53171:53194
 
-BUG32308 DEBUG : fast/frames/cached-frame-counter.html = TIMEOUT
+BUG32308 DEBUG WIN MAC : fast/frames/cached-frame-counter.html = TIMEOUT
 
 // WebKit roll 53341:53451
 BUG32670 LINUX : fast/css/zoom-body-scroll.html = TEXT
@@ -3190,4 +3190,7 @@ BUG57957 LINUX DEBUG : fast/blockflow/block-level-images.html = IMAGE PASS
 // Failing since r69181. Verified as legitimate by looking at the results
 // of the SVG rendering.
 BUG58194 LINUX : svg/filters/sourceAlpha.svg = IMAGE
-BUG58195 WIN : svg/filters/feDisplacementMap.svg = IMAGE
+BUG58195 WIN LINUX : svg/filters/feDisplacementMap.svg = IMAGE
+
+// Test added in Webkit r69226 timesout on all platforms.
+BUG58212 : http/tests/appcache/main-resource-redirect.html = TIMEOUT
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
index aab21da..56ca0ca 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/port/base.py
@@ -445,7 +445,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()))
+        #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