tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.txt b/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.txt
index 2a694be..54da03a 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/control-restrict-line-height-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/control-restrict-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
       RenderText {#text} at (0,0) size 390x14
         text run at (0,0) width 390: "This tests that we don't honor line-height for controls that have restricted font size. "
       RenderBR {BR} at (0,0) size 0x0
@@ -30,3 +31,32 @@ layer at (14,128) size 187x26 scrollWidth 360
   RenderBlock {DIV} at (0,0) size 187x26
     RenderText {#text} at (1,4) size 358x17
       text run at (1,4) width 358: "This text should be centered vertically in the button"
+=======
+      RenderText {#text} at (0,0) size 519x19
+        text run at (0,0) width 519: "This tests that we don't honor line-height for controls that have restricted font size. "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderMenuList {SELECT} at (2,21) size 414x46 [color=#202020]
+        RenderBlock (anonymous) at (15,10) size 358x26
+          RenderText at (0,3) size 358x19
+            text run at (0,3) width 358: "This text should be centered vertically in the button"
+      RenderText {#text} at (418,34) size 4x19
+        text run at (418,34) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderButton {INPUT} at (2,71) size 388x44 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 358x26
+          RenderText at (0,3) size 358x19
+            text run at (0,3) width 358: "This text should be centered vertically in the button"
+      RenderText {#text} at (392,82) size 4x19
+        text run at (392,82) width 4: " "
+      RenderBR {BR} at (0,0) size 0x0
+      RenderTextControl {INPUT} at (2,119) size 195x36 [color=#202020]
+        RenderDeprecatedFlexibleBox {DIV} at (4,6) size 188x26
+          RenderBlock {DIV} at (0,13) size 0x0
+          RenderBlock {DIV} at (0,0) size 188x26
+          RenderBlock {DIV} at (188,13) size 0x0
+      RenderText {#text} at (0,0) size 0x0
+layer at (14,133) size 188x26 scrollWidth 360
+  RenderBlock {DIV} at (0,0) size 188x26
+    RenderText {#text} at (1,3) size 358x19
+      text run at (1,3) width 358: "This text should be centered vertically in the button"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d