tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / forms / input-appearance-preventDefault-expected.txt

diff --git a/LayoutTests/platform/efl/fast/forms/input-appearance-preventDefault-expected.txt b/LayoutTests/platform/efl/fast/forms/input-appearance-preventDefault-expected.txt
index 47ce6d1..d21a3bf 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/input-appearance-preventDefault-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/input-appearance-preventDefault-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
       RenderBR {BR} at (0,0) size 0x14
       RenderText {#text} at (0,14) size 500x14
         text run at (0,14) width 500: "This tests that preventDefault called onmousedown will prevent a caret from being placed in the text field. "
@@ -19,3 +20,21 @@ layer at (10,70) size 241x28
     RenderBR {BR} at (0,0) size 0x14
     RenderText {#text} at (0,14) size 241x14
       text run at (0,14) width 241: "mousedown on target [object HTMLInputElement]"
+=======
+      RenderBR {BR} at (0,0) size 0x19
+      RenderText {#text} at (0,19) size 670x19
+        text run at (0,19) width 670: "This tests that preventDefault called onmousedown will prevent a caret from being placed in the text field. "
+      RenderText {#text} at (0,0) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (12,52) size 195x29
+  RenderTextControl {INPUT} at (12,52) size 195x29 [color=#202020]
+layer at (16,58) size 188x19
+  RenderBlock {DIV} at (4,6) size 188x19
+    RenderText {#text} at (1,0) size 170x19
+      text run at (1,0) width 170: "No caret should be here"
+layer at (10,70) size 323x38
+  RenderBlock (positioned) {DIV} at (10,70) size 323x38
+    RenderBR {BR} at (0,0) size 0x19
+    RenderText {#text} at (0,19) size 323x19
+      text run at (0,19) width 323: "mousedown on target [object HTMLInputElement]"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d