tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / focus-layers-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/focus-layers-expected.txt b/LayoutTests/platform/efl/fast/repaint/focus-layers-expected.txt
index 1099d1d..1200eb6 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/focus-layers-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/focus-layers-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 784x14
         RenderText {#text} at (0,0) size 26x14
           text run at (0,0) width 26: "Both "
@@ -15,3 +16,17 @@ layer at (36,128) size 214x18
   RenderBlock (positioned) {SPAN} at (2,122) size 214x18 [border: (2px solid #0000FF)]
     RenderText {#text} at (2,2) size 210x14
       text run at (2,2) width 210: "this should have correctly placed focus rings"
+=======
+      RenderBlock {DIV} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 35x19
+          text run at (0,0) width 35: "Both "
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,8) size 53x23
+  RenderInline (relative positioned) {A} at (0,0) size 53x23 [color=#0000EE] [border: (2px solid #FF0000)]
+    RenderText {#text} at (37,0) size 49x19
+      text run at (37,0) width 49: "this and"
+layer at (45,168) size 283x23
+  RenderBlock (positioned) {SPAN} at (2,162) size 283x23 [border: (2px solid #0000FF)]
+    RenderText {#text} at (2,2) size 279x19
+      text run at (2,2) width 279: "this should have correctly placed focus rings"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d