tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0402-c71-fwd-parsing-01-f-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt
index 06cdc46..2be018b 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0402-c71-fwd-parsing-01-f-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x166
   RenderBlock {HTML} at (0,0) size 800x166
     RenderBody {BODY} at (8,12) size 784x142 [color=#000080]
@@ -18,3 +19,23 @@ layer at (0,0) size 800x166
       RenderBlock {P} at (0,122) size 784x20 [border: (3px solid #000080)]
         RenderText {#text} at (3,3) size 20x14
           text run at (3,3) width 20: "Test"
+=======
+layer at (0,0) size 800x215
+  RenderBlock {HTML} at (0,0) size 800x215
+    RenderBody {BODY} at (8,16) size 784x183 [color=#000080]
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 348x19
+          text run at (0,0) width 348: "The next four blocks should look identical, to the pixel."
+      RenderBlock {P} at (0,35) size 784x25 [border: (3px solid #000080)]
+        RenderText {#text} at (3,3) size 27x19
+          text run at (3,3) width 27: "Test"
+      RenderBlock {P} at (0,76) size 784x25 [border: (3px solid #000080)]
+        RenderText {#text} at (3,3) size 27x19
+          text run at (3,3) width 27: "Test"
+      RenderBlock {P} at (0,117) size 784x25 [border: (3px solid #000080)]
+        RenderText {#text} at (3,3) size 27x19
+          text run at (3,3) width 27: "Test"
+      RenderBlock {P} at (0,158) size 784x25 [border: (3px solid #000080)]
+        RenderText {#text} at (3,3) size 27x19
+          text run at (3,3) width 27: "Test"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d