tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / forms / textarea-width-expected.txt

diff --git a/LayoutTests/platform/efl/fast/forms/textarea-width-expected.txt b/LayoutTests/platform/efl/fast/forms/textarea-width-expected.txt
index 2ac79c1..f47106a 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/textarea-width-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/textarea-width-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 {DIV} at (0,0) size 784x28
         RenderText {#text} at (0,0) size 751x28
           text run at (0,0) width 751: "This text area should be drawn with a reasonable width. To match IE, using GDI fonts it should wrap at 66 characters (after the X in the third set of digits). See"
@@ -18,3 +19,20 @@ layer at (8,50) size 535x250
         text run at (0,12) width 182: "J1234567890abcdefghijABCDEFGHIJ"
         text run at (182,12) width 0: " "
       RenderBR {BR} at (0,24) size 0x12
+=======
+      RenderBlock {DIV} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 778x38
+          text run at (0,0) width 778: "This text area should be drawn with a reasonable width. To match IE, using GDI fonts it should wrap at 66 characters (after"
+          text run at (0,19) width 532: "the X in the third set of digits). See https://bugs.webkit.org/show_bug.cgi?id=15312."
+      RenderBlock (anonymous) at (0,38) size 784x289
+        RenderBR {BR} at (0,0) size 0x19
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,65) size 550x270
+  RenderTextControl {TEXTAREA} at (0,19) size 550x270 [color=#202020]
+    RenderBlock {DIV} at (4,6) size 543x39
+      RenderText {#text} at (0,0) size 541x26
+        text run at (0,0) width 541: "1234567890abcdefghijABCDEFGHIJ1234567890abcdefghijABCDEFGHIJ12345X7890abcdefghijABCDEFGXIJ1234"
+        text run at (0,13) width 148: "567890abcdefghijABCDEFGHIJ"
+        text run at (148,13) width 0: " "
+      RenderBR {BR} at (0,26) size 0x13
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d