tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / search-field-cancel-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/search-field-cancel-expected.txt b/LayoutTests/platform/efl/fast/repaint/search-field-cancel-expected.txt
index ac39193..5587b6c 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/search-field-cancel-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/search-field-cancel-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 {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 40x14
           text run at (0,0) width 40: "Test for "
@@ -12,13 +13,28 @@ layer at (0,0) size 800x600
         RenderText {#text} at (270,0) size 240x14
           text run at (270,0) width 240: ". The cancel button in a search field fails to redraw."
       RenderBlock (anonymous) at (0,26) size 784x33
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 53x19
+          text run at (0,0) width 53: "Test for "
+        RenderInline {A} at (0,0) size 305x19 [color=#0000EE]
+          RenderText {#text} at (53,0) size 305x19
+            text run at (53,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=23093"
+        RenderText {#text} at (358,0) size 322x19
+          text run at (358,0) width 322: ". The cancel button in a search field fails to redraw."
+      RenderBlock (anonymous) at (0,35) size 784x33
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderTextControl {INPUT} at (2,2) size 195x29 [color=#202020]
           RenderDeprecatedFlexibleBox {DIV} at (4,6) size 188x19
             RenderBlock {DIV} at (0,9) size 0x0
             RenderBlock {DIV} at (0,0) size 188x19
             RenderBlock {DIV} at (188,9) size 0x0
         RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
 layer at (14,42) size 188x19
+=======
+layer at (14,51) size 188x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock {DIV} at (0,0) size 188x19
     RenderText {#text} at (1,0) size 68x19
       text run at (1,0) width 68: "some text"