tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / fast / ruby / rubyDOM-insert-rt-expected.txt

diff --git a/LayoutTests/platform/efl/fast/ruby/rubyDOM-insert-rt-expected.txt b/LayoutTests/platform/efl/fast/ruby/rubyDOM-insert-rt-expected.txt
index a538e5b..1e72e65 100755 (executable)
--- a/LayoutTests/platform/efl/fast/ruby/rubyDOM-insert-rt-expected.txt
+++ b/LayoutTests/platform/efl/fast/ruby/rubyDOM-insert-rt-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 432x14
@@ -64,3 +65,67 @@ layer at (0,0) size 800x600
                 text run at (0,0) width 6: "5"
         RenderText {#text} at (193,6) size 27x14
           text run at (193,6) width 27: " spec."
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 574x19
+          text run at (0,0) width 574: "The following is a test for DOM manipulation within <ruby>: Inserting a new <rt> element"
+      RenderBlock {P} at (0,35) size 784x19
+        RenderText {#text} at (0,0) size 436x19
+          text run at (0,0) width 436: "Both lines should look identical (the first line is the one manipulated)."
+      RenderBlock (anonymous) at (0,70) size 784x38
+        RenderBR {BR} at (0,0) size 0x19
+        RenderBR {BR} at (0,19) size 0x19
+      RenderBlock {P} at (0,124) size 784x29
+        RenderText {#text} at (0,10) size 155x19
+          text run at (0,10) width 155: "<ruby> is defined in the "
+        RenderRuby (inline) {RUBY} at (0,0) size 101x19
+          RenderRubyRun (anonymous) at (151,10) size 36x19
+            RenderRubyText {RT} at (0,-10) size 36x10
+              RenderText {#text} at (0,0) size 36x10
+                text run at (0,0) width 36: "Hyper-text"
+            RenderRubyBase (anonymous) at (0,0) size 36x19
+              RenderInline {SPAN} at (0,0) size 22x19
+                RenderText {#text} at (7,0) size 22x19
+                  text run at (7,0) width 22: "HT"
+          RenderRubyRun (anonymous) at (187,10) size 61x19
+            RenderRubyText {RT} at (0,-10) size 61x10
+              RenderText {#text} at (0,0) size 61x10
+                text run at (0,0) width 61: "Markup Language"
+            RenderRubyBase (anonymous) at (0,0) size 61x19
+              RenderInline {SPAN} at (0,0) size 25x19
+                RenderText {#text} at (18,0) size 25x19
+                  text run at (18,0) width 25: "ML"
+          RenderRubyRun (anonymous) at (248,10) size 8x19
+            RenderRubyBase (anonymous) at (0,0) size 8x19
+              RenderText {#text} at (0,0) size 8x19
+                text run at (0,0) width 8: "5"
+        RenderText {#text} at (256,10) size 36x19
+          text run at (256,10) width 36: " spec."
+      RenderBlock {P} at (0,169) size 784x29
+        RenderText {#text} at (0,10) size 155x19
+          text run at (0,10) width 155: "<ruby> is defined in the "
+        RenderRuby (inline) {RUBY} at (0,0) size 101x19
+          RenderRubyRun (anonymous) at (151,10) size 36x19
+            RenderRubyText {RT} at (0,-10) size 36x10
+              RenderText {#text} at (0,0) size 36x10
+                text run at (0,0) width 36: "Hyper-text"
+            RenderRubyBase (anonymous) at (0,0) size 36x19
+              RenderInline {SPAN} at (0,0) size 22x19
+                RenderText {#text} at (7,0) size 22x19
+                  text run at (7,0) width 22: "HT"
+          RenderRubyRun (anonymous) at (187,10) size 61x19
+            RenderRubyText {RT} at (0,-10) size 61x10
+              RenderText {#text} at (0,0) size 61x10
+                text run at (0,0) width 61: "Markup Language"
+            RenderRubyBase (anonymous) at (0,0) size 61x19
+              RenderInline {SPAN} at (0,0) size 25x19
+                RenderText {#text} at (18,0) size 25x19
+                  text run at (18,0) width 25: "ML"
+          RenderRubyRun (anonymous) at (248,10) size 8x19
+            RenderRubyBase (anonymous) at (0,0) size 8x19
+              RenderText {#text} at (0,0) size 8x19
+                text run at (0,0) width 8: "5"
+        RenderText {#text} at (256,10) size 36x19
+          text run at (256,10) width 36: " spec."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d