tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / text / international / bidi-L2-run-reordering-expected.txt

diff --git a/LayoutTests/platform/efl/fast/text/international/bidi-L2-run-reordering-expected.txt b/LayoutTests/platform/efl/fast/text/international/bidi-L2-run-reordering-expected.txt
index f044628..7c3e058 100755 (executable)
--- a/LayoutTests/platform/efl/fast/text/international/bidi-L2-run-reordering-expected.txt
+++ b/LayoutTests/platform/efl/fast/text/international/bidi-L2-run-reordering-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x64
   RenderBlock {HTML} at (0,0) size 800x64
     RenderBody {BODY} at (8,12) size 784x40
@@ -32,4 +33,39 @@ layer at (0,0) size 800x64
             text run at (263,0) width 21: "123"
             text run at (284,0) width 22 RTL: "\x{5D0}\x{5D1}\x{5D2} "
             text run at (306,0) width 20: " def"
+=======
+layer at (0,0) size 800x105
+  RenderBlock {HTML} at (0,0) size 800x105
+    RenderBody {BODY} at (8,16) size 784x73
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 755x38
+          text run at (0,0) width 755: "The three boxes should be the same. The order in each box should be: Roman letters, Hebrew"
+          text run at (0,19) width 359: "letters, digits, Hebrew letters, Roman letters."
+      RenderBlock {P} at (0,54) size 784x19
+        RenderInline {SPAN} at (0,0) size 158x21 [border: (1px solid #008000)]
+          RenderText {#text} at (1,0) size 156x19
+            text run at (1,0) width 34: "abc "
+            text run at (35,0) width 29 RTL: " \x{5D3}\x{5D4}\x{5D5}"
+            text run at (64,0) width 30: "123"
+            text run at (94,0) width 32 RTL: "\x{5D0}\x{5D1}\x{5D2} "
+            text run at (126,0) width 31: " def"
+        RenderText {#text} at (158,0) size 5x19
+          text run at (158,0) width 5: " "
+        RenderInline {SPAN} at (0,0) size 158x21 [border: (1px solid #008000)]
+          RenderText {#text} at (164,0) size 156x19
+            text run at (164,0) width 34: "abc "
+            text run at (198,0) width 29 RTL: " \x{5D3}\x{5D4}\x{5D5}"
+            text run at (227,0) width 30: "123"
+            text run at (257,0) width 32 RTL: "\x{5D0}\x{5D1}\x{5D2} "
+            text run at (289,0) width 31: " def"
+        RenderText {#text} at (321,0) size 5x19
+          text run at (321,0) width 5: " "
+        RenderInline {SPAN} at (0,0) size 158x21 [border: (1px solid #008000)]
+          RenderText {#text} at (327,0) size 156x19
+            text run at (327,0) width 34: "abc "
+            text run at (361,0) width 29 RTL: " \x{5D3}\x{5D4}\x{5D5}"
+            text run at (390,0) width 30: "123"
+            text run at (420,0) width 32 RTL: "\x{5D0}\x{5D1}\x{5D2} "
+            text run at (452,0) width 31: " def"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0