tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / inline-block / 006-expected.txt

diff --git a/LayoutTests/platform/efl/fast/inline-block/006-expected.txt b/LayoutTests/platform/efl/fast/inline-block/006-expected.txt
index fa43d7c..b4b2927 100755 (executable)
--- a/LayoutTests/platform/efl/fast/inline-block/006-expected.txt
+++ b/LayoutTests/platform/efl/fast/inline-block/006-expected.txt
@@ -3,6 +3,7 @@ layer 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
+<<<<<<< HEAD
       RenderText {#text} at (0,0) size 658x14
         text run at (0,0) width 235: "This is a baseline alignment test for inline blocks. "
         text run at (235,0) width 423: "The last lines of the two red-bordered inline blocks should line up and be on the baseline. "
@@ -31,3 +32,34 @@ layer at (0,0) size 800x600
       RenderBR {BR} at (459,75) size 0x0
       RenderText {#text} at (0,130) size 64x14
         text run at (0,130) width 64: "The next line."
+=======
+      RenderText {#text} at (0,0) size 772x38
+        text run at (0,0) width 313: "This is a baseline alignment test for inline blocks. "
+        text run at (313,0) width 459: "The last lines of the two red-bordered inline blocks should line up and be"
+        text run at (0,19) width 102: "on the baseline. "
+      RenderBR {BR} at (102,34) size 0x0
+      RenderBlock {DIV} at (0,67) size 255x62 [border: (2px solid #FF0000)]
+        RenderText {#text} at (12,12) size 81x19
+          text run at (12,12) width 81: "This is block"
+        RenderBR {BR} at (93,27) size 0x0
+        RenderText {#text} at (12,31) size 231x19
+          text run at (12,31) width 83: "number one. "
+          text run at (95,31) width 148: "This line is the last one."
+      RenderText {#text} at (255,98) size 4x19
+        text run at (255,98) width 4: " "
+      RenderBlock {DIV} at (259,38) size 192x131 [border: (2px solid #FF0000)]
+        RenderBlock (anonymous) at (12,12) size 168x38
+          RenderText {#text} at (0,0) size 42x19
+            text run at (0,0) width 42: "This is"
+          RenderBR {BR} at (42,15) size 0x0
+          RenderText {#text} at (0,19) size 80x19
+            text run at (0,19) width 80: "number two."
+        RenderBlock {DIV} at (12,50) size 168x39
+          RenderText {#text} at (10,10) size 148x19
+            text run at (10,10) width 148: "This line is the last one."
+      RenderText {#text} at (451,98) size 139x19
+        text run at (451,98) width 139: " More text on the line."
+      RenderBR {BR} at (590,113) size 0x0
+      RenderText {#text} at (0,169) size 87x19
+        text run at (0,169) width 87: "The next line."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d