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

ossy at webkit.org ossy at webkit.org
Wed Dec 22 18:10:20 UTC 2010


The following commit has been merged in the debian/experimental branch:
commit 692183f4f3ff1f2a6e86a3e5c03556c72df6e540
Author: ossy at webkit.org <ossy at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 8 11:17:50 2010 +0000

    Unreviewed. Update Qt specific expected results after r73488.
    Compared to Mac png files and Mac expected files.
    
    * platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.checksum:
    * platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png:
    * platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt:
    * platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum:
    * platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.png:
    * platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.txt:
    * platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum:
    * platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png:
    * platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt:
    * platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.checksum:
    * platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.png:
    * platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.txt:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@73502 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index fa96321..4c6fa7b 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,21 @@
+2010-12-08  Csaba Osztrogonác  <ossy at webkit.org>
+
+        Unreviewed. Update Qt specific expected results after r73488.
+        Compared to Mac png files and Mac expected files.
+
+        * platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.checksum:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.png:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.txt:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.checksum:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.png:
+        * platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.txt:
+
 2010-12-08  Philippe Normand  <pnormand at igalia.com>
 
         Unreviewed, updated baselines of
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.checksum b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.checksum
index e28ac0b..835e091 100644
--- a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.checksum
+++ b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.checksum
@@ -1 +1 @@
-d71551637059adf65a4f69d3ac29c37c
\ No newline at end of file
+9ada1aaedeea6519c66ab18cf154fd28
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png
index a61e56e..826bfe7 100644
Binary files a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png and b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt
index 9a31fe2..5f11d65 100644
--- a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-boundary-values-expected.txt
@@ -21,6 +21,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (117,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 0x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,16) size 80x0
         RenderListItem {LI} at (40,42) size 744x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderInline {B} at (0,0) size 16x21
@@ -31,6 +33,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 0x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,16) size 80x0
         RenderListItem {LI} at (40,63) size 744x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 20x21
@@ -43,6 +47,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 20x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,12) size 80x4
           RenderText {#text} at (185,0) size 117x21
             text run at (185,0) width 117: "(should be green)"
         RenderListItem {LI} at (40,84) size 744x21
@@ -57,6 +63,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 40x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,8) size 80x8
           RenderText {#text} at (185,0) size 117x21
             text run at (185,0) width 117: "(should be green)"
         RenderListItem {LI} at (40,105) size 744x21
@@ -71,6 +79,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 60x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,4) size 80x12
           RenderText {#text} at (185,0) size 117x21
             text run at (185,0) width 117: "(should be green)"
         RenderListItem {LI} at (40,126) size 744x21
@@ -85,6 +95,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
           RenderText {#text} at (185,0) size 122x21
             text run at (185,0) width 122: "(should be yellow)"
         RenderListItem {LI} at (40,147) size 744x21
@@ -99,6 +111,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (125,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
           RenderText {#text} at (205,0) size 122x21
             text run at (205,0) width 122: "(should be yellow)"
         RenderListItem {LI} at (40,168) size 744x21
@@ -113,6 +127,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 0x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,16) size 80x0
         RenderListItem {LI} at (40,189) size 744x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 60x21
@@ -125,6 +141,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
           RenderText {#text} at (185,0) size 117x21
             text run at (185,0) width 117: "(should be green)"
         RenderListItem {LI} at (40,210) size 744x21
@@ -137,6 +155,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (117,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 0x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,16) size 80x0
         RenderListItem {LI} at (40,231) size 744x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 40x21
@@ -149,6 +169,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 0x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,16) size 80x0
         RenderListItem {LI} at (40,252) size 744x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 40x21
@@ -161,6 +183,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
           RenderText {#text} at (185,0) size 117x21
             text run at (185,0) width 117: "(should be green)"
         RenderListItem {LI} at (40,273) size 744x21
@@ -175,6 +199,8 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (125,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
           RenderText {#text} at (205,0) size 117x21
             text run at (205,0) width 117: "(should be green)"
         RenderListItem {LI} at (40,294) size 744x21
@@ -189,5 +215,7 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (105,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 40x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,8) size 80x8
           RenderText {#text} at (185,0) size 117x21
             text run at (185,0) width 117: "(should be green)"
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum
index f84ca2a..8e650ec 100644
--- a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum
+++ b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.checksum
@@ -1 +1 @@
-52c715f7b9dea197aa29f32a6558f189
\ No newline at end of file
+40857cb69f75d8398b978e0cc7c32ccd
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.png b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.png
index d17b978..19df4b5 100644
Binary files a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.png and b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.txt b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.txt
index ba60136..2fda061 100644
--- a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-optimums-expected.txt
@@ -20,6 +20,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 20x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,12) size 80x4
         RenderListItem {LI} at (40,21) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 78x21
@@ -27,6 +29,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 36x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,9) size 80x7
         RenderListItem {LI} at (40,42) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 78x21
@@ -34,6 +38,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 60x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,4) size 80x12
         RenderListItem {LI} at (40,63) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 62x21
@@ -41,6 +47,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (62,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 0x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,16) size 80x0
         RenderListItem {LI} at (40,84) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 86x21
@@ -48,6 +56,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (86,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
       RenderBlock {H2} at (0,277) size 768x31
         RenderText {#text} at (0,0) size 143x32
           text run at (0,0) width 143: "optimum=150"
@@ -59,6 +69,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 20x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,12) size 80x4
         RenderListItem {LI} at (40,21) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 78x21
@@ -66,6 +78,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 36x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,9) size 80x7
         RenderListItem {LI} at (40,42) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 78x21
@@ -73,6 +87,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 60x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,4) size 80x12
         RenderListItem {LI} at (40,63) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 62x21
@@ -80,6 +96,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (62,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 0x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,16) size 80x0
         RenderListItem {LI} at (40,84) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 86x21
@@ -87,6 +105,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (86,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
       RenderBlock {H2} at (0,451) size 768x31
         RenderText {#text} at (0,0) size 143x32
           text run at (0,0) width 143: "optimum=750"
@@ -98,6 +118,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 20x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,12) size 80x4
         RenderListItem {LI} at (40,21) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 78x21
@@ -105,6 +127,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 36x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,9) size 80x7
         RenderListItem {LI} at (40,42) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 78x21
@@ -112,6 +136,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (78,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 60x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,4) size 80x12
         RenderListItem {LI} at (40,63) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 62x21
@@ -119,6 +145,8 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (62,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 0x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,16) size 80x0
         RenderListItem {LI} at (40,84) size 728x21
           RenderListMarker at (-18,0) size 7x21: bullet
           RenderText {#text} at (0,0) size 86x21
@@ -126,3 +154,5 @@ layer at (0,0) size 784x630
           RenderMeter {METER} at (86,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,0) size 80x16
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum
index bb44887..8a7ca9e 100644
--- a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum
+++ b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.checksum
@@ -1 +1 @@
-55776cbe9839a76cbc776047eda34bce
\ No newline at end of file
+c35321bc04eb1de7a7c0b5ad9dfc9791
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png
index 67d2d14..0e45aa1 100644
Binary files a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png and b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt
index a177959..ff9c535 100644
--- a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-changing-pseudo-expected.txt
@@ -13,12 +13,16 @@ layer at (0,0) size 800x600
         RenderMeter {METER} at (0,0) size 80x16
           RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080]
           RenderBlock {DIV} at (0,0) size 72x16 [bgcolor=#008000]
+          RenderBlock {DIV} at (0,0) size 80x16
+          RenderBlock {DIV} at (0,2) size 80x14
         RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,132) size 784x21
         RenderText {#text} at (0,0) size 784x21
           text run at (0,0) width 784: "Following meter gauge should be blue - Changing the pseudo class by changing direction from horizontal to vertical."
       RenderBlock (anonymous) at (0,169) size 784x100
         RenderMeter {METER} at (0,0) size 80x100
+          RenderBlock {DIV} at (0,0) size 80x100
+          RenderBlock {DIV} at (0,0) size 72x100
           RenderBlock {DIV} at (0,0) size 80x100 [bgcolor=#808080]
           RenderBlock {DIV} at (0,10) size 80x90 [bgcolor=#0000FF]
         RenderText {#text} at (0,0) size 0x0
@@ -30,4 +34,6 @@ layer at (0,0) size 800x600
         RenderMeter {METER} at (0,0) size 80x20
           RenderBlock {DIV} at (0,0) size 80x20
           RenderBlock {DIV} at (0,0) size 72x20
+          RenderBlock {DIV} at (0,0) size 80x20 [bgcolor=#808080]
+          RenderBlock {DIV} at (0,2) size 80x18 [bgcolor=#0000FF]
         RenderText {#text} at (0,0) size 0x0
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.checksum b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.checksum
index 8eb67d8..125567a 100644
--- a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.checksum
+++ b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.checksum
@@ -1 +1 @@
-e8e73491305ceae9d9221a749f0a31f4
\ No newline at end of file
+d625efbc265660d2df7c6506b772a16b
\ No newline at end of file
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.png b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.png
index eddd9f5..5ab4524 100644
Binary files a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.png and b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.png differ
diff --git a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.txt b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.txt
index 7a97f4a..4c44b89 100644
--- a/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.txt
+++ b/LayoutTests/platform/qt/fast/dom/HTMLMeterElement/meter-styles-expected.txt
@@ -11,14 +11,20 @@ layer at (0,0) size 800x600
           RenderMeter {METER} at (0,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 20x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,12) size 80x4
         RenderListItem {LI} at (43,24) size 732x21
           RenderMeter {METER} at (0,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 36x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,9) size 80x7
         RenderListItem {LI} at (43,48) size 732x21
           RenderMeter {METER} at (0,3) size 80x16
             RenderBlock {DIV} at (0,0) size 80x16
             RenderBlock {DIV} at (0,0) size 60x16
+            RenderBlock {DIV} at (0,0) size 80x16
+            RenderBlock {DIV} at (0,4) size 80x12
       RenderBlock {H2} at (3,96) size 778x21
         RenderText {#text} at (0,0) size 332x21
           text run at (0,0) width 332: "Vertical meters with the non-themed default style"
@@ -26,14 +32,20 @@ layer at (0,0) size 800x600
         RenderListItem {LI} at (43,0) size 732x42
           RenderMeter {METER} at (0,0) size 30x40
             RenderBlock {DIV} at (0,0) size 30x40
+            RenderBlock {DIV} at (0,0) size 7x40
+            RenderBlock {DIV} at (0,0) size 30x40
             RenderBlock {DIV} at (0,30) size 30x10
         RenderListItem {LI} at (43,45) size 732x42
           RenderMeter {METER} at (0,0) size 30x40
             RenderBlock {DIV} at (0,0) size 30x40
+            RenderBlock {DIV} at (0,0) size 13x40
+            RenderBlock {DIV} at (0,0) size 30x40
             RenderBlock {DIV} at (0,22) size 30x18
         RenderListItem {LI} at (43,90) size 732x42
           RenderMeter {METER} at (0,0) size 30x40
             RenderBlock {DIV} at (0,0) size 30x40
+            RenderBlock {DIV} at (0,0) size 22x40
+            RenderBlock {DIV} at (0,0) size 30x40
             RenderBlock {DIV} at (0,10) size 30x30
       RenderBlock {H2} at (3,255) size 778x21
         RenderText {#text} at (0,0) size 150x21
@@ -44,18 +56,24 @@ layer at (0,0) size 800x600
             RenderMeter {METER} at (0,0) size 230x31 [bgcolor=#AAAACC] [border: (10px solid #222244) (50px solid #222244) (5px solid #222244) (100px solid #222244)]
               RenderBlock {DIV} at (100,10) size 80x16
               RenderBlock {DIV} at (100,10) size 64x16
+              RenderBlock {DIV} at (100,10) size 80x16
+              RenderBlock {DIV} at (100,14) size 80x12
             RenderText {#text} at (230,12) size 78x21
               text run at (230,12) width 78: " has border"
           RenderListItem {LI} at (43,36) size 732x33
             RenderMeter {METER} at (0,0) size 230x31 [bgcolor=#AAAACC]
               RenderBlock {DIV} at (100,10) size 80x16
               RenderBlock {DIV} at (100,10) size 64x16
+              RenderBlock {DIV} at (100,10) size 80x16
+              RenderBlock {DIV} at (100,14) size 80x12
             RenderText {#text} at (230,12) size 87x21
               text run at (230,12) width 87: " has padding"
           RenderListItem {LI} at (43,72) size 732x33
             RenderMeter {METER} at (100,10) size 80x16 [bgcolor=#AAAACC]
               RenderBlock {DIV} at (0,0) size 80x16
               RenderBlock {DIV} at (0,0) size 64x16
+              RenderBlock {DIV} at (0,0) size 80x16
+              RenderBlock {DIV} at (0,4) size 80x12
             RenderText {#text} at (230,12) size 80x21
               text run at (230,12) width 80: " has margin"
       RenderBlock {H2} at (3,387) size 778x21
@@ -67,18 +85,24 @@ layer at (0,0) size 800x600
             RenderMeter {METER} at (0,3) size 80x16
               RenderBlock {DIV} at (0,0) size 80x16
               RenderBlock {DIV} at (0,0) size 64x16 [bgcolor=#008000] [border: (2px solid #77CC77)]
+              RenderBlock {DIV} at (0,0) size 80x16
+              RenderBlock {DIV} at (0,4) size 80x12
             RenderText {#text} at (80,0) size 267x21
               text run at (80,0) width 267: " has bar style, should be styled as it has."
           RenderListItem {LI} at (43,24) size 732x21
             RenderMeter {METER} at (0,3) size 80x16
               RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080] [border: (2px solid #222222)]
               RenderBlock {DIV} at (0,0) size 64x16
+              RenderBlock {DIV} at (0,0) size 80x16
+              RenderBlock {DIV} at (0,4) size 80x12
             RenderText {#text} at (80,0) size 279x21
               text run at (80,0) width 279: " has value style, should be styled as it has."
           RenderListItem {LI} at (43,48) size 732x21
             RenderMeter {METER} at (0,3) size 80x16
               RenderBlock {DIV} at (0,0) size 80x16 [bgcolor=#808080] [border: (2px solid #222222)]
               RenderBlock {DIV} at (0,0) size 64x16 [bgcolor=#008000] [border: (2px solid #77CC77)]
+              RenderBlock {DIV} at (0,0) size 80x16
+              RenderBlock {DIV} at (0,4) size 80x12
             RenderText {#text} at (80,0) size 280x21
               text run at (80,0) width 280: " has both styles, should be styled as it has."
       RenderBlock {H2} at (3,483) size 778x21
@@ -90,11 +114,15 @@ layer at (0,0) size 800x600
             RenderMeter {METER} at (0,3) size 80x16
               RenderBlock {DIV} at (0,0) size 80x16
               RenderBlock {DIV} at (0,0) size 64x16
+              RenderBlock {DIV} at (0,0) size 80x16
+              RenderBlock {DIV} at (0,4) size 80x12
             RenderText {#text} at (80,0) size 404x21
               text run at (80,0) width 404: " has \"none\" appearance, should be styled with default style."
           RenderListItem {LI} at (43,24) size 732x21
             RenderMeter {METER} at (0,3) size 80x16
               RenderBlock {DIV} at (0,0) size 80x16
               RenderBlock {DIV} at (0,0) size 64x16
+              RenderBlock {DIV} at (0,0) size 80x16
+              RenderBlock {DIV} at (0,4) size 80x12
             RenderText {#text} at (80,0) size 302x21
               text run at (80,0) width 302: " has \"meter\" appearance, should be themed."

-- 
WebKit Debian packaging



More information about the Pkg-webkit-commits mailing list