tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / ruby / ruby-run-break-expected.txt

diff --git a/LayoutTests/platform/efl/fast/ruby/ruby-run-break-expected.txt b/LayoutTests/platform/efl/fast/ruby/ruby-run-break-expected.txt
index 6d59801..1a19059 100755 (executable)
--- a/LayoutTests/platform/efl/fast/ruby/ruby-run-break-expected.txt
+++ b/LayoutTests/platform/efl/fast/ruby/ruby-run-break-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
       RenderBlock (anonymous) at (0,0) size 784x42
         RenderText {#text} at (0,0) size 782x28
           text run at (0,0) width 782: "This is a test for multiple ruby runs and line breaks. There is a div with a blue border and 10px padding. This contains a single <ruby> markup in the text contained in"
@@ -51,3 +52,54 @@ layer at (0,0) size 800x600
                 text run at (7,0) width 6: "5"
         RenderText {#text} at (214,12) size 32x14
           text run at (214,12) width 32: " specs."
+=======
+      RenderBlock (anonymous) at (0,0) size 784x76
+        RenderText {#text} at (0,0) size 767x57
+          text run at (0,0) width 752: "This is a test for multiple ruby runs and line breaks. There is a div with a blue border and 10px padding. This contains a"
+          text run at (0,19) width 497: "single <ruby> markup in the text contained in the block, broken across 2 lines. "
+          text run at (497,19) width 270: "Part of it should be on the first line, the rest"
+          text run at (0,38) width 110: "on the other line. "
+        RenderBR {BR} at (110,53) size 0x0
+        RenderBR {BR} at (0,57) size 0x19
+      RenderBlock {DIV} at (0,76) size 284x72 [border: (2px solid #0000FF)]
+        RenderText {#text} at (12,12) size 155x19
+          text run at (12,12) width 155: "<ruby> is defined in the "
+        RenderRuby (inline) {RUBY} at (0,0) size 246x48
+          RenderRubyRun (anonymous) at (163,12) size 21x19
+            RenderRubyText {RT} at (0,-10) size 21x10
+              RenderText {#text} at (0,0) size 21x10
+                text run at (0,0) width 21: "Hyper"
+            RenderRubyBase (anonymous) at (0,0) size 21x19
+              RenderText {#text} at (4,0) size 13x19
+                text run at (4,0) width 13: "H"
+          RenderRubyRun (anonymous) at (184,12) size 15x19
+            RenderRubyText {RT} at (0,-10) size 15x10
+              RenderText {#text} at (0,0) size 15x10
+                text run at (0,0) width 15: "Text"
+            RenderRubyBase (anonymous) at (0,0) size 15x19
+              RenderText {#text} at (2,0) size 11x19
+                text run at (2,0) width 11: "T"
+          RenderRubyRun (anonymous) at (199,12) size 26x19
+            RenderRubyText {RT} at (0,-10) size 26x10
+              RenderText {#text} at (0,0) size 26x10
+                text run at (0,0) width 26: "Markup"
+            RenderRubyBase (anonymous) at (0,0) size 26x19
+              RenderText {#text} at (6,0) size 14x19
+                text run at (6,0) width 14: "M"
+          RenderRubyRun (anonymous) at (225,12) size 33x19
+            RenderRubyText {RT} at (0,-10) size 33x10
+              RenderText {#text} at (0,0) size 33x10
+                text run at (0,0) width 33: "Language"
+            RenderRubyBase (anonymous) at (0,0) size 33x19
+              RenderText {#text} at (11,0) size 11x19
+                text run at (11,0) width 11: "L"
+          RenderRubyRun (anonymous) at (12,41) size 25x19
+            RenderRubyText {RT} at (0,-10) size 25x10
+              RenderText {#text} at (0,0) size 25x10
+                text run at (0,0) width 25: "Level 5"
+            RenderRubyBase (anonymous) at (0,0) size 25x19
+              RenderText {#text} at (8,0) size 9x19
+                text run at (8,0) width 9: "5"
+        RenderText {#text} at (33,41) size 42x19
+          text run at (33,41) width 42: " specs."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d