[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

ossy at webkit.org ossy at webkit.org
Thu Apr 8 01:50:33 UTC 2010


The following commit has been merged in the webkit-1.2 branch:
commit cce369d1b60279abcf454706841807a2053823c5
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 17 15:14:38 2010 +0000

    Rubber-stamped by Tor Arne Vestbø.
    
    [Qt] Add platform specific expected files for new tests pass in fast/css.
    
    Rendertree results compared to Mac expected files with --ignore-metrics,
    pixel results compared to Mac png files.
    
    fast/css/font-face-opentype.html introduced in r54855.
    fast/css/inline-element-line-break.html introduced in r54544.
    fast/css/pseudo-element-line-break.html introduced in r54544.
    
    * platform/qt/fast/css/font-face-opentype-expected.txt: Added.
    * platform/qt/fast/css/inline-element-line-break-expected.txt: Added.
    * platform/qt/fast/css/pseudo-element-line-break-expected.txt: Added.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54896 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 918ef90..a65610e 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2010-02-17  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Rubber-stamped by Tor Arne Vestbø.
+
+        [Qt] Add platform specific expected files for new tests pass in fast/css.
+
+        Rendertree results compared to Mac expected files with --ignore-metrics,
+        pixel results compared to Mac png files.
+
+        fast/css/font-face-opentype.html introduced in r54855.
+        fast/css/inline-element-line-break.html introduced in r54544.
+        fast/css/pseudo-element-line-break.html introduced in r54544.
+
+        * platform/qt/fast/css/font-face-opentype-expected.txt: Added.
+        * platform/qt/fast/css/inline-element-line-break-expected.txt: Added.
+        * platform/qt/fast/css/pseudo-element-line-break-expected.txt: Added.
+
 2010-02-17  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Not reviewed. Try to turn SnowLeopard slave green again. Skipping media/video-load-networkState.html - already filed a bug last year.
diff --git a/LayoutTests/platform/qt/fast/css/font-face-opentype-expected.txt b/LayoutTests/platform/qt/fast/css/font-face-opentype-expected.txt
new file mode 100644
index 0000000..c182f5d
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/css/font-face-opentype-expected.txt
@@ -0,0 +1,42 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x584
+      RenderBlock {P} at (0,0) size 784x40
+        RenderText {#text} at (0,0) size 57x20
+          text run at (0,0) width 57: "Test for "
+        RenderInline {I} at (0,0) size 754x40
+          RenderInline {A} at (0,0) size 338x20 [color=#0000EE]
+            RenderText {#text} at (57,0) size 338x20
+              text run at (57,0) width 338: "https://bugs.webkit.org/show_bug.cgi?id=34735"
+          RenderText {#text} at (395,0) size 754x40
+            text run at (395,0) width 359: " [Chromium] OpenType font with CFF glyphs is not"
+            text run at (0,20) width 240: "handled correctly on Windows XP"
+        RenderText {#text} at (240,20) size 4x20
+          text run at (240,20) width 4: "."
+      RenderBlock {P} at (0,56) size 784x40
+        RenderText {#text} at (0,0) size 734x40
+          text run at (0,0) width 734: "Check if glyphs in Ahem.otf can be rendered correctly. If the test passes, you should see dozens of black"
+          text run at (0,20) width 178: "square characters below:"
+      RenderBlock (anonymous) at (0,112) size 784x32
+        RenderInline {SPAN} at (0,0) size 736x16
+          RenderText {#text} at (0,0) size 736x16
+            text run at (0,0) width 736: "!\"#$%&()*+,-./0123456789:;<=>?@ABCDEFGHIJKLMNO"
+        RenderText {#text} at (0,0) size 0x0
+        RenderInline {SPAN} at (0,0) size 736x16
+          RenderText {#text} at (0,16) size 736x16
+            text run at (0,16) width 736: "PQRSTUVWXYZ[\\]^_`abcdefghijklmnoqrstuvwxyz{|}~"
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,160) size 784x40
+        RenderText {#text} at (0,0) size 739x40
+          text run at (0,0) width 739: "Check if glyphs not in Ahem.otf can be rendered using a fallback font. If the test passes, you should see a"
+          text run at (0,20) width 209: "single-quote character below:"
+      RenderBlock (anonymous) at (0,216) size 784x16
+        RenderInline {SPAN} at (0,0) size 4x16
+          RenderText {#text} at (0,0) size 4x16
+            text run at (0,0) width 4: "'"
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/fast/css/inline-element-line-break-expected.txt b/LayoutTests/platform/qt/fast/css/inline-element-line-break-expected.txt
new file mode 100644
index 0000000..10d76af
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/css/inline-element-line-break-expected.txt
@@ -0,0 +1,70 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 86x46 [border: (3px solid #0000FF)]
+        RenderInline {SPAN} at (0,0) size 99x20
+          RenderText {#text} at (3,3) size 99x20
+            text run at (3,3) width 99: "AAAAAAAAA"
+        RenderText {#text} at (102,3) size 121x40
+          text run at (102,3) width 22: "AA"
+          text run at (3,23) width 22: "BB"
+      RenderBlock {P} at (0,62) size 86x26 [border: (3px solid #0000FF)]
+        RenderInline {SPAN} at (0,0) size 99x20
+          RenderText {#text} at (3,3) size 99x20
+            text run at (3,3) width 99: "AAAAAAAAA"
+        RenderText {#text} at (102,3) size 55x20
+          text run at (102,3) width 55: "AAAAA"
+      RenderBlock {P} at (0,104) size 86x46 [border: (3px solid #0000FF)]
+        RenderInline {SPAN} at (0,0) size 44x20
+          RenderText {#text} at (3,3) size 44x20
+            text run at (3,3) width 44: "AAAA"
+        RenderText {#text} at (0,0) size 0x0
+        RenderInline {SPAN} at (0,0) size 44x20
+          RenderText {#text} at (3,23) size 44x20
+            text run at (3,23) width 44: "BBBB"
+        RenderText {#text} at (47,23) size 55x20
+          text run at (47,23) width 55: "BBBBB"
+      RenderBlock {P} at (0,166) size 86x46 [border: (3px solid #0000FF)]
+        RenderInline {SPAN} at (0,0) size 99x20
+          RenderText {#text} at (3,3) size 99x20
+            text run at (3,3) width 99: "AAAAAAAAA"
+        RenderText {#text} at (102,3) size 121x40
+          text run at (102,3) width 22: "AA"
+          text run at (3,23) width 20: "ZZ"
+        RenderInline {SPAN} at (0,0) size 90x20
+          RenderText {#text} at (23,23) size 90x20
+            text run at (23,23) width 90: "ZZZZZZZZZ"
+      RenderBlock {P} at (0,228) size 86x26 [border: (3px solid #0000FF)]
+        RenderInline {SPAN} at (0,0) size 99x20
+          RenderText {#text} at (3,3) size 99x20
+            text run at (3,3) width 99: "AAAAAAAAA"
+        RenderText {#text} at (102,3) size 65x20
+          text run at (102,3) width 65: "MMMMM"
+        RenderInline {SPAN} at (0,0) size 90x20
+          RenderText {#text} at (167,3) size 90x20
+            text run at (167,3) width 90: "ZZZZZZZZZ"
+      RenderBlock {P} at (0,270) size 86x46 [border: (3px solid #0000FF)]
+        RenderText {#text} at (3,3) size 55x20
+          text run at (3,3) width 55: "YYYYY"
+        RenderInline {SPAN} at (0,0) size 44x20
+          RenderText {#text} at (58,3) size 44x20
+            text run at (58,3) width 44: "YYYY"
+        RenderText {#text} at (0,0) size 0x0
+        RenderInline {SPAN} at (0,0) size 40x20
+          RenderText {#text} at (3,23) size 40x20
+            text run at (3,23) width 40: "ZZZZ"
+      RenderBlock {P} at (0,332) size 86x46 [border: (3px solid #0000FF)]
+        RenderText {#text} at (3,3) size 22x40
+          text run at (3,3) width 22: "YY"
+          text run at (3,23) width 20: "ZZ"
+        RenderInline {SPAN} at (0,0) size 90x20
+          RenderText {#text} at (23,23) size 90x20
+            text run at (23,23) width 90: "ZZZZZZZZZ"
+      RenderBlock {P} at (0,394) size 86x26 [border: (3px solid #0000FF)]
+        RenderText {#text} at (3,3) size 50x20
+          text run at (3,3) width 50: "ZZZZZ"
+        RenderInline {SPAN} at (0,0) size 90x20
+          RenderText {#text} at (53,3) size 90x20
+            text run at (53,3) width 90: "ZZZZZZZZZ"
diff --git a/LayoutTests/platform/qt/fast/css/pseudo-element-line-break-expected.txt b/LayoutTests/platform/qt/fast/css/pseudo-element-line-break-expected.txt
new file mode 100644
index 0000000..1c7abd7
--- /dev/null
+++ b/LayoutTests/platform/qt/fast/css/pseudo-element-line-break-expected.txt
@@ -0,0 +1,64 @@
+layer at (0,0) size 800x600
+  RenderView at (0,0) size 800x600
+layer at (0,0) size 800x600
+  RenderBlock {HTML} at (0,0) size 800x600
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 86x46 [border: (3px solid #0000FF)]
+        RenderInline (generated) at (0,0) size 99x20
+          RenderText at (3,3) size 99x20
+            text run at (3,3) width 99: "AAAAAAAAA"
+        RenderText {#text} at (102,3) size 121x40
+          text run at (102,3) width 22: "AA"
+          text run at (3,23) width 22: "BB"
+      RenderBlock {P} at (0,62) size 86x26 [border: (3px solid #0000FF)]
+        RenderInline (generated) at (0,0) size 99x20
+          RenderText at (3,3) size 99x20
+            text run at (3,3) width 99: "AAAAAAAAA"
+        RenderText {#text} at (102,3) size 55x20
+          text run at (102,3) width 55: "AAAAA"
+      RenderBlock {P} at (0,104) size 86x46 [border: (3px solid #0000FF)]
+        RenderInline (generated) at (0,0) size 44x40
+          RenderText at (3,3) size 44x40
+            text run at (3,3) width 44: "AAAA"
+            text run at (3,23) width 44: "BBBB"
+        RenderText {#text} at (47,23) size 55x20
+          text run at (47,23) width 55: "BBBBB"
+      RenderBlock {P} at (0,166) size 86x46 [border: (3px solid #0000FF)]
+        RenderInline (generated) at (0,0) size 99x20
+          RenderText at (3,3) size 99x20
+            text run at (3,3) width 99: "AAAAAAAAA"
+        RenderText {#text} at (102,3) size 121x40
+          text run at (102,3) width 22: "AA"
+          text run at (3,23) width 20: "ZZ"
+        RenderInline (generated) at (0,0) size 90x20
+          RenderText at (23,23) size 90x20
+            text run at (23,23) width 90: "ZZZZZZZZZ"
+      RenderBlock {P} at (0,228) size 86x26 [border: (3px solid #0000FF)]
+        RenderInline (generated) at (0,0) size 99x20
+          RenderText at (3,3) size 99x20
+            text run at (3,3) width 99: "AAAAAAAAA"
+        RenderText {#text} at (102,3) size 65x20
+          text run at (102,3) width 65: "MMMMM"
+        RenderInline (generated) at (0,0) size 90x20
+          RenderText at (167,3) size 90x20
+            text run at (167,3) width 90: "ZZZZZZZZZ"
+      RenderBlock {P} at (0,270) size 86x46 [border: (3px solid #0000FF)]
+        RenderText {#text} at (3,3) size 55x20
+          text run at (3,3) width 55: "YYYYY"
+        RenderInline (generated) at (0,0) size 99x40
+          RenderText at (58,3) size 99x40
+            text run at (58,3) width 44: "YYYY"
+            text run at (3,23) width 40: "ZZZZ"
+      RenderBlock {P} at (0,332) size 86x46 [border: (3px solid #0000FF)]
+        RenderText {#text} at (3,3) size 22x40
+          text run at (3,3) width 22: "YY"
+          text run at (3,23) width 20: "ZZ"
+        RenderInline (generated) at (0,0) size 90x20
+          RenderText at (23,23) size 90x20
+            text run at (23,23) width 90: "ZZZZZZZZZ"
+      RenderBlock {P} at (0,394) size 86x26 [border: (3px solid #0000FF)]
+        RenderText {#text} at (3,3) size 50x20
+          text run at (3,3) width 50: "ZZZZZ"
+        RenderInline (generated) at (0,0) size 90x20
+          RenderText at (53,3) size 90x20
+            text run at (53,3) width 90: "ZZZZZZZZZ"

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list