tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / encoding / denormalised-voiced-japanese-chars-expected.txt

diff --git a/LayoutTests/platform/efl/fast/encoding/denormalised-voiced-japanese-chars-expected.txt b/LayoutTests/platform/efl/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
index cacd249..e0a584c 100755 (executable)
--- a/LayoutTests/platform/efl/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
+++ b/LayoutTests/platform/efl/fast/encoding/denormalised-voiced-japanese-chars-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x174
   RenderBlock {HTML} at (0,0) size 800x174
     RenderBody {BODY} at (8,8) size 784x154
@@ -19,3 +20,25 @@ layer at (0,0) size 800x174
       RenderBlock {P} at (0,140) size 784x14
         RenderText {#text} at (0,0) size 126x14
           text run at (0,0) width 126: "The above is precomposed"
+=======
+layer at (0,0) size 800x251
+  RenderBlock {HTML} at (0,0) size 800x251
+    RenderBody {BODY} at (8,8) size 784x227
+      RenderBlock (anonymous) at (0,0) size 784x57
+        RenderText {#text} at (0,0) size 775x57
+          text run at (0,0) width 775: "This test checks that the decomposed unicode version of voiced japanese hiragana and katakana characters are rendered the"
+          text run at (0,19) width 724: "same as the precomposed version. This test is a pixel-test, and passes when the text in the two heading elements are"
+          text run at (0,38) width 57: "identical."
+      RenderBlock {H2} at (0,76) size 784x28
+        RenderText {#text} at (0,0) size 98x28
+          text run at (0,0) width 98: "\x{30CF}\x{3099}\x{30CA}\x{30CA}\x{3068}\x{30CF}\x{309A}\x{30CA}\x{30DE}"
+      RenderBlock {P} at (0,123) size 784x19
+        RenderText {#text} at (0,0) size 164x19
+          text run at (0,0) width 164: "The above is decomposed"
+      RenderBlock {H2} at (0,161) size 784x28
+        RenderText {#text} at (0,0) size 98x28
+          text run at (0,0) width 98: "\x{30D0}\x{30CA}\x{30CA}\x{3068}\x{30D1}\x{30CA}\x{30DE}"
+      RenderBlock {P} at (0,208) size 784x19
+        RenderText {#text} at (0,0) size 169x19
+          text run at (0,0) width 169: "The above is precomposed"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d