tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / runin / 001-expected.txt

diff --git a/LayoutTests/platform/efl/fast/runin/001-expected.txt b/LayoutTests/platform/efl/fast/runin/001-expected.txt
index 28d98df..2a20cb4 100755 (executable)
--- a/LayoutTests/platform/efl/fast/runin/001-expected.txt
+++ b/LayoutTests/platform/efl/fast/runin/001-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x170
   RenderBlock {HTML} at (0,0) size 800x170
     RenderBody {BODY} at (8,8) size 784x154
@@ -45,3 +46,50 @@ layer at (0,0) size 800x170
         RenderBlock (run-in) {DIV} at (0,14) size 784x14
           RenderText {#text} at (0,0) size 31x14
             text run at (0,0) width 31: "run in."
+=======
+layer at (0,0) size 800x225
+  RenderBlock {HTML} at (0,0) size 800x225
+    RenderBody {BODY} at (8,8) size 784x209
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 51x19
+          text run at (0,0) width 51: "Case A:"
+      RenderBlock {DIV} at (0,19) size 784x38
+        RenderBlock (run-in) {DIV} at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 112x19
+            text run at (0,0) width 112: "This should NOT"
+        RenderBlock (anonymous) at (0,19) size 784x19
+          RenderInline {DIV} at (0,0) size 41x19
+            RenderText {#text} at (0,0) size 41x19
+              text run at (0,0) width 41: "run in."
+          RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,57) size 784x19
+        RenderText {#text} at (0,0) size 50x19
+          text run at (0,0) width 50: "Case B:"
+      RenderBlock {DIV} at (0,76) size 784x38
+        RenderBlock (run-in) {DIV} at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 112x19
+            text run at (0,0) width 112: "This should NOT"
+        RenderBlock (anonymous) at (0,19) size 784x19
+          RenderText {#text} at (0,0) size 41x19
+            text run at (0,0) width 41: "run in."
+      RenderBlock (anonymous) at (0,114) size 784x19
+        RenderText {#text} at (0,0) size 50x19
+          text run at (0,0) width 50: "Case C:"
+      RenderBlock {DIV} at (0,133) size 784x19
+        RenderBlock {DIV} at (0,0) size 784x19
+          RenderInline (run-in) {DIV} at (0,0) size 78x19
+            RenderText {#text} at (0,0) size 78x19
+              text run at (0,0) width 78: "This should "
+          RenderText {#text} at (78,0) size 41x19
+            text run at (78,0) width 41: "run in."
+      RenderBlock (anonymous) at (0,152) size 784x19
+        RenderText {#text} at (0,0) size 51x19
+          text run at (0,0) width 51: "Case D:"
+      RenderBlock {DIV} at (0,171) size 784x38
+        RenderBlock (run-in) {DIV} at (0,0) size 784x19
+          RenderText {#text} at (0,0) size 112x19
+            text run at (0,0) width 112: "This should NOT"
+        RenderBlock (run-in) {DIV} at (0,19) size 784x19
+          RenderText {#text} at (0,0) size 41x19
+            text run at (0,0) width 41: "run in."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d