tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / lineboxcontain / parsing-invalid-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/lineboxcontain/parsing-invalid-expected.txt b/LayoutTests/platform/efl/fast/block/lineboxcontain/parsing-invalid-expected.txt
index ee5a088..9ec45a0 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/lineboxcontain/parsing-invalid-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/lineboxcontain/parsing-invalid-expected.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 layer at (0,0) size 800x1494
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x1494
@@ -70,4 +71,78 @@ layer at (8,1206) size 320x256
     RenderInline {SPAN} at (0,0) size 64x64 [color=#008000]
       RenderText {#text} at (256,160) size 64x64
         text run at (256,160) width 64: "x"
+=======
+layer at (0,0) size 785x1499
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x1499
+  RenderBlock {HTML} at (0,0) size 785x1499
+    RenderBody {BODY} at (8,8) size 769x1459
+      RenderBlock (anonymous) at (0,0) size 769x19
+        RenderText {#text} at (0,0) size 259x19
+          text run at (0,0) width 259: "All of these blocks should look the same."
+layer at (8,59) size 320x256
+  RenderBlock {DIV} at (0,51) size 320x256 [bgcolor=#00FF00]
+    RenderInline {SPAN} at (0,0) size 320x65 [color=#008000]
+      RenderText {#text} at (0,31) size 320x65
+        text run at (0,31) width 320: "xxxxx"
+    RenderBR {BR} at (320,31) size 0x65
+    RenderBlock {DIV} at (0,159) size 256x64 [color=#008000]
+      RenderText {#text} at (0,0) size 256x65
+        text run at (0,0) width 256: "xxxx"
+    RenderInline {SPAN} at (0,0) size 64x65 [color=#008000]
+      RenderText {#text} at (256,159) size 64x65
+        text run at (256,159) width 64: "x"
+    RenderText {#text} at (0,0) size 0x0
+layer at (8,347) size 320x256
+  RenderBlock {DIV} at (0,339) size 320x256 [bgcolor=#00FF00]
+    RenderInline {SPAN} at (0,0) size 320x65 [color=#008000]
+      RenderText {#text} at (0,31) size 320x65
+        text run at (0,31) width 320: "xxxxx"
+    RenderBR {BR} at (320,31) size 0x65
+    RenderBlock {DIV} at (0,159) size 256x64 [color=#008000]
+      RenderText {#text} at (0,0) size 256x65
+        text run at (0,0) width 256: "xxxx"
+    RenderInline {SPAN} at (0,0) size 64x65 [color=#008000]
+      RenderText {#text} at (256,159) size 64x65
+        text run at (256,159) width 64: "x"
+    RenderText {#text} at (0,0) size 0x0
+layer at (8,635) size 320x256
+  RenderBlock {DIV} at (0,627) size 320x256 [bgcolor=#00FF00]
+    RenderInline {SPAN} at (0,0) size 320x65 [color=#008000]
+      RenderText {#text} at (0,31) size 320x65
+        text run at (0,31) width 320: "xxxxx"
+    RenderBR {BR} at (320,31) size 0x65
+    RenderBlock {DIV} at (0,159) size 256x64 [color=#008000]
+      RenderText {#text} at (0,0) size 256x65
+        text run at (0,0) width 256: "xxxx"
+    RenderInline {SPAN} at (0,0) size 64x65 [color=#008000]
+      RenderText {#text} at (256,159) size 64x65
+        text run at (256,159) width 64: "x"
+    RenderText {#text} at (0,0) size 0x0
+layer at (8,923) size 320x256
+  RenderBlock {DIV} at (0,915) size 320x256 [bgcolor=#00FF00]
+    RenderInline {SPAN} at (0,0) size 320x65 [color=#008000]
+      RenderText {#text} at (0,31) size 320x65
+        text run at (0,31) width 320: "xxxxx"
+    RenderBR {BR} at (320,31) size 0x65
+    RenderBlock {DIV} at (0,159) size 256x64 [color=#008000]
+      RenderText {#text} at (0,0) size 256x65
+        text run at (0,0) width 256: "xxxx"
+    RenderInline {SPAN} at (0,0) size 64x65 [color=#008000]
+      RenderText {#text} at (256,159) size 64x65
+        text run at (256,159) width 64: "x"
+    RenderText {#text} at (0,0) size 0x0
+layer at (8,1211) size 320x256
+  RenderBlock {DIV} at (0,1203) size 320x256 [bgcolor=#00FF00]
+    RenderInline {SPAN} at (0,0) size 320x65 [color=#008000]
+      RenderText {#text} at (0,31) size 320x65
+        text run at (0,31) width 320: "xxxxx"
+    RenderBR {BR} at (320,31) size 0x65
+    RenderBlock {DIV} at (0,159) size 256x64 [color=#008000]
+      RenderText {#text} at (0,0) size 256x65
+        text run at (0,0) width 256: "xxxx"
+    RenderInline {SPAN} at (0,0) size 64x65 [color=#008000]
+      RenderText {#text} at (256,159) size 64x65
+        text run at (256,159) width 64: "x"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
     RenderText {#text} at (0,0) size 0x0