tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0804-c5507-padn-r-01-c-a-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt
index aa07f88..c940e4e 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0804-c5507-padn-r-01-c-a-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x142
   RenderBlock {HTML} at (0,0) size 800x142
     RenderBody {BODY} at (8,8) size 784x122
@@ -24,3 +25,29 @@ layer at (0,0) size 800x142
           RenderBlock {DIV} at (60,0) size 36x12 [border: none (24px solid #00FFFF) none (12px solid #008080)]
         RenderBlock {DIV} at (3,27) size 120x12 [border: none (24px solid #FFFF00) none (84px solid #FFFF00)]
           RenderBlock {DIV} at (84,0) size 12x12 [border: none (12px solid #008080) none none]
+=======
+layer at (0,0) size 800x183
+  RenderBlock {HTML} at (0,0) size 800x183
+    RenderBody {BODY} at (8,8) size 784x159
+      RenderBlock {P} at (0,0) size 784x19 [color=#000080]
+        RenderText {#text} at (0,0) size 318x19
+          text run at (0,0) width 318: "The following two diagrams should look identical."
+      RenderBlock {DIV} at (16,35) size 166x54 [color=#008080] [bgcolor=#FFA500] [border: (3px solid #000000)]
+        RenderBlock {UL} at (3,3) size 160x48 [bgcolor=#FFFF00]
+          RenderListItem {LI} at (0,0) size 128x16
+            RenderText {#text} at (112,0) size 16x17
+              text run at (112,0) width 16: "-"
+          RenderListItem {LI} at (0,16) size 128x16 [bgcolor=#00FFFF]
+            RenderText {#text} at (80,0) size 16x17
+              text run at (80,0) width 16: "-"
+          RenderListItem {LI} at (0,32) size 128x16
+            RenderText {#text} at (112,0) size 16x17
+              text run at (112,0) width 16: "-"
+      RenderBlock {DIV} at (16,105) size 166x54 [bgcolor=#FF0000] [border: (3px solid #000000)]
+        RenderBlock {DIV} at (3,3) size 160x16 [border: none (32px solid #FFFF00) none (112px solid #FFFF00)]
+          RenderBlock {DIV} at (112,0) size 16x16 [border: none (16px solid #008080) none none]
+        RenderBlock {DIV} at (3,19) size 160x16 [border: none (32px solid #FFFF00) none (80px solid #00FFFF)]
+          RenderBlock {DIV} at (80,0) size 48x16 [border: none (32px solid #00FFFF) none (16px solid #008080)]
+        RenderBlock {DIV} at (3,35) size 160x16 [border: none (32px solid #FFFF00) none (112px solid #FFFF00)]
+          RenderBlock {DIV} at (112,0) size 16x16 [border: none (16px solid #008080) none none]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d