Two lineboxcontain tests are failing

https://bugs.webkit.org/show_bug.cgi?id=82742

Reviewed by Ojan Vafai.

* platform/mac/fast/block/lineboxcontain/block-glyphs-replaced-expected.txt:
* platform/mac/fast/block/lineboxcontain/glyphs-expected.txt:
Rebaselined.

* platform/mac/Skipped:
* platform/mac/test_expectations.txt:
Unskip some tests that are either rebaselined or now passing due to
r112582 re-adding some of the RenderLayers removed by r110072.

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@114198 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index b23ca4e..317df7f 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,19 @@
+2012-04-13  Julien Chaffraix  <jchaffraix@webkit.org>
+
+        Two lineboxcontain tests are failing
+        https://bugs.webkit.org/show_bug.cgi?id=82742
+
+        Reviewed by Ojan Vafai.
+
+        * platform/mac/fast/block/lineboxcontain/block-glyphs-replaced-expected.txt:
+        * platform/mac/fast/block/lineboxcontain/glyphs-expected.txt:
+        Rebaselined.
+
+        * platform/mac/Skipped:
+        * platform/mac/test_expectations.txt:
+        Unskip some tests that are either rebaselined or now passing due to
+        r112582 re-adding some of the RenderLayers removed by r110072.
+
 2012-04-13  Raymond Liu  <raymond.liu@intel.com>
 
         Add layout test case for JavaScriptAudioNode.

diff --git a/LayoutTests/platform/mac/Skipped b/LayoutTests/platform/mac/Skipped
index 5e01bf9..dae5a35 100644 (file)
--- a/LayoutTests/platform/mac/Skipped
+++ b/LayoutTests/platform/mac/Skipped
@@ -659,16 +659,6 @@ platform/mac/editing/spelling/delete-into-autocorrected-word.html
 platform/mac/editing/spelling/click-autocorrected-word.html
 platform/mac/editing/spelling/autocorrection-contraction.html
 
-# This should only be a layer change.
-# http://webkit.org/b/82129
-# https://bugs.webkit.org/show_bug.cgi?id=82742
-fast/box-shadow/shadow-buffer-partial.html
-fast/block/lineboxcontain/block-font.html
-fast/block/lineboxcontain/block-glyphs.html
-fast/block/lineboxcontain/font.html
-fast/block/lineboxcontain/block-glyphs-replaced.html
-fast/block/lineboxcontain/glyphs.html
-
 # https://bugs.webkit.org/show_bug.cgi?id=82665
 http/tests/webarchive/test-css-url-encoding-shift-jis.html
 http/tests/webarchive/test-css-url-encoding-utf-8.html

diff --git a/LayoutTests/platform/mac/fast/block/lineboxcontain/block-glyphs-replaced-expected.txt b/LayoutTests/platform/mac/fast/block/lineboxcontain/block-glyphs-replaced-expected.txt
index cbd2d39..78cd6e6 100644 (file)
--- a/LayoutTests/platform/mac/fast/block/lineboxcontain/block-glyphs-replaced-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/lineboxcontain/block-glyphs-replaced-expected.txt
@@ -7,17 +7,18 @@ layer at (0,0) size 800x272
         RenderText {#text} at (0,0) size 640x18
           text run at (0,0) width 260: "You should see a green rectangle below. "
           text run at (260,0) width 380: "If you see any red other than anti-aliasing, the test has failed."
-      RenderBlock {DIV} at (0,18) size 384x194 [bgcolor=#FF0000]
-        RenderInline {SPAN} at (0,0) size 320x64 [color=#008000]
-          RenderText {#text} at (0,1) size 320x64
-            text run at (0,1) width 320: "xxxxx"
-        RenderInline {SPAN} at (0,0) size 64x128 [bgcolor=#008000]
-        RenderBR {BR} at (384,1) size 0x64
-        RenderInline {SPAN} at (0,0) size 320x128 [color=#008000]
-          RenderText {#text} at (0,66) size 320x128
-            text run at (0,66) width 320: "xxxxx"
-        RenderBlock {DIV} at (320,66) size 64x128 [bgcolor=#008000]
-        RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,228) size 784x20 [border: (1px solid #000000)]
         RenderText {#text} at (1,1) size 185x18
           text run at (1,1) width 185: "This line should look normal."
+layer at (8,26) size 384x194
+  RenderBlock {DIV} at (0,18) size 384x194 [bgcolor=#FF0000]
+    RenderInline {SPAN} at (0,0) size 320x64 [color=#008000]
+      RenderText {#text} at (0,1) size 320x64
+        text run at (0,1) width 320: "xxxxx"
+    RenderInline {SPAN} at (0,0) size 64x128 [bgcolor=#008000]
+    RenderBR {BR} at (384,1) size 0x64
+    RenderInline {SPAN} at (0,0) size 320x128 [color=#008000]
+      RenderText {#text} at (0,66) size 320x128
+        text run at (0,66) width 320: "xxxxx"
+    RenderBlock {DIV} at (320,66) size 64x128 [bgcolor=#008000]
+    RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/mac/fast/block/lineboxcontain/glyphs-expected.txt b/LayoutTests/platform/mac/fast/block/lineboxcontain/glyphs-expected.txt
index 7a33168..caf48cd 100644 (file)
--- a/LayoutTests/platform/mac/fast/block/lineboxcontain/glyphs-expected.txt
+++ b/LayoutTests/platform/mac/fast/block/lineboxcontain/glyphs-expected.txt
@@ -7,17 +7,6 @@ layer at (0,0) size 800x275
         RenderText {#text} at (0,0) size 493x18
           text run at (0,0) width 260: "You should see a green rectangle below. "
           text run at (260,0) width 233: "If you see any red, the test has failed."
-      RenderBlock {DIV} at (0,18) size 384x130 [bgcolor=#FF0000]
-        RenderInline {SPAN} at (0,0) size 320x64 [color=#008000]
-          RenderText {#text} at (0,1) size 320x64
-            text run at (0,1) width 320: "xxxxx"
-        RenderInline {SPAN} at (0,0) size 64x128 [bgcolor=#008000]
-        RenderBR {BR} at (384,1) size 0x64
-        RenderBlock {DIV} at (0,2) size 64x128 [bgcolor=#008000]
-        RenderInline {SPAN} at (0,0) size 320x64 [color=#008000]
-          RenderText {#text} at (64,66) size 320x64
-            text run at (64,66) width 320: "xxxxx"
-        RenderText {#text} at (0,0) size 0x0
       RenderBlock {P} at (0,164) size 784x17 [border: (1px solid #000000)]
         RenderText {#text} at (1,-2) size 275x18
           text run at (1,-2) width 275: "this block should hug the lowercase glyphs."
@@ -33,3 +22,15 @@ layer at (0,0) size 800x275
         RenderBR {BR} at (539,18) size 0x18
         RenderText {#text} at (0,36) size 450x18
           text run at (0,36) width 450: "Maybe we should do this by default for all first letters like Firefox does."
+layer at (8,26) size 384x130
+  RenderBlock {DIV} at (0,18) size 384x130 [bgcolor=#FF0000]
+    RenderInline {SPAN} at (0,0) size 320x64 [color=#008000]
+      RenderText {#text} at (0,1) size 320x64
+        text run at (0,1) width 320: "xxxxx"
+    RenderInline {SPAN} at (0,0) size 64x128 [bgcolor=#008000]
+    RenderBR {BR} at (384,1) size 0x64
+    RenderBlock {DIV} at (0,2) size 64x128 [bgcolor=#008000]
+    RenderInline {SPAN} at (0,0) size 320x64 [color=#008000]
+      RenderText {#text} at (64,66) size 320x64
+        text run at (64,66) width 320: "xxxxx"
+    RenderText {#text} at (0,0) size 0x0

diff --git a/LayoutTests/platform/mac/test_expectations.txt b/LayoutTests/platform/mac/test_expectations.txt
index 88f8ccc..686dcab 100644 (file)
--- a/LayoutTests/platform/mac/test_expectations.txt
+++ b/LayoutTests/platform/mac/test_expectations.txt
@@ -165,7 +165,6 @@ BUGWK69210: fast/repaint/transform-absolute-in-positioned-container.html = TEXT
 // The change should only be layer removal.
 BUGWK75568 : animations/combo-transform-translate+scale.html = TEXT
 BUGWK75568 : editing/spelling/inline_spelling_markers.html = TEXT
-BUGWK75568 : fast/box-shadow/shadow-buffer-partial.html = TEXT
 BUGWK75568 : fast/forms/form-element-geometry.html = TEXT
 BUGWK75568 : fast/forms/input-value.html = TEXT
 BUGWK75568 : fast/layers/add-layer-with-nested-stacking.html = TEXT
@@ -207,9 +206,6 @@ BUGWK75568 : fast/block/float/float-overflow-hidden-containing-block-width.html
 BUGWK75568 : fast/block/float/in-margin.html = TEXT
 BUGWK75568 : fast/block/float/overlapping-floats-with-overflow-hidden.html = TEXT
 BUGWK75568 : fast/block/float/shrink-to-avoid-float-complexity.html = TEXT
-BUGWK75568 : fast/block/lineboxcontain/block-font.html = TEXT
-BUGWK75568 : fast/block/lineboxcontain/block-glyphs.html = TEXT
-BUGWK75568 : fast/block/lineboxcontain/font.html = TEXT
 BUGWK75568 : fast/block/lineboxcontain/parsing-invalid.html = TEXT
 BUGWK75568 : fast/block/margin-collapse/103.html = TEXT
 BUGWK75568 : fast/clip/017.html = TEXT