tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / css / line-height-expected.txt

diff --git a/LayoutTests/platform/efl/fast/css/line-height-expected.txt b/LayoutTests/platform/efl/fast/css/line-height-expected.txt
index 917e878..69ce6dd 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css/line-height-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/line-height-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 40x14
           text run at (0,0) width 40: "Test for "
@@ -20,4 +21,24 @@ layer at (0,0) size 800x600
 layer at (14,30) size 187x18
   RenderBlock {DIV} at (4,6) size 187x18
     RenderText {#text} at (1,0) size 92x17
+=======
+      RenderBlock {DIV} 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 120x19 [color=#0000EE]
+          RenderText {#text} at (53,0) size 120x19
+            text run at (53,0) width 120: "Bugzilla Bug 9934"
+        RenderText {#text} at (173,0) size 451x19
+          text run at (173,0) width 451: " Selecting text in text field with {line-height:100%} causes it to bounce."
+      RenderBlock {DIV} at (0,19) size 784x33
+        RenderTextControl {INPUT} at (2,2) size 195x29 [color=#202020]
+      RenderBlock {DIV} at (0,52) size 784x38
+        RenderText {#text} at (0,0) size 735x38
+          text run at (0,0) width 574: "Select the text in the text field using horizontal mouse movements, then drag up and down. "
+          text run at (574,0) width 161: "The text should not move"
+          text run at (0,19) width 62: "vertically."
+layer at (14,35) size 188x19
+  RenderBlock {DIV} at (4,6) size 188x19
+    RenderText {#text} at (1,0) size 92x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       text run at (1,0) width 92: "Lorem Ipsum"