tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/forms/input-button-sizes-expected.txt b/LayoutTests/platform/efl/fast/forms/input-button-sizes-expected.txt
index 5bff0d0..d8262f3 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/input-button-sizes-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/input-button-sizes-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
       RenderButton {INPUT} at (0,9) size 55x24 [color=#202020]
         RenderBlock (anonymous) at (15,8) size 25x6
           RenderText at (0,0) size 25x6
@@ -102,5 +103,106 @@ layer at (0,0) size 800x600
       RenderButton {INPUT} at (142,83) size 140x42 [color=#202020]
         RenderBlock (anonymous) at (15,8) size 110x24
           RenderText at (0,0) size 110x23
+=======
+      RenderButton {INPUT} at (0,9) size 55x25 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 25x7
+          RenderText at (0,0) size 25x7
+            text run at (0,0) width 25: "Test Button"
+      RenderText {#text} at (55,7) size 4x19
+        text run at (55,7) width 4: " "
+      RenderButton {INPUT} at (59,8) size 61x26 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 31x8
+          RenderText at (0,0) size 31x8
+            text run at (0,0) width 31: "Test Button"
+      RenderText {#text} at (120,7) size 4x19
+        text run at (120,7) width 4: " "
+      RenderButton {INPUT} at (124,7) size 67x27 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 37x9
+          RenderText at (0,0) size 37x9
+            text run at (0,0) width 37: "Test Button"
+      RenderText {#text} at (191,7) size 4x19
+        text run at (191,7) width 4: " "
+      RenderButton {INPUT} at (195,6) size 68x28 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 38x10
+          RenderText at (0,0) size 38x10
+            text run at (0,0) width 38: "Test Button"
+      RenderText {#text} at (263,7) size 4x19
+        text run at (263,7) width 4: " "
+      RenderButton {INPUT} at (267,5) size 79x29 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 49x11
+          RenderText at (0,0) size 49x11
+            text run at (0,0) width 49: "Test Button"
+      RenderText {#text} at (346,7) size 4x19
+        text run at (346,7) width 4: " "
+      RenderButton {INPUT} at (350,4) size 84x31 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 54x13
+          RenderText at (0,0) size 54x13
+            text run at (0,0) width 54: "Test Button"
+      RenderText {#text} at (434,7) size 4x19
+        text run at (434,7) width 4: " "
+      RenderButton {INPUT} at (440,4) size 86x31 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 56x13
+          RenderText at (0,0) size 56x13
+            text run at (0,0) width 56: "Test Button"
+      RenderText {#text} at (528,7) size 4x19
+        text run at (528,7) width 4: " "
+      RenderButton {INPUT} at (534,3) size 91x32 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 61x14
+          RenderText at (0,0) size 61x14
+            text run at (0,0) width 61: "Test Button"
+      RenderText {#text} at (627,7) size 4x19
+        text run at (627,7) width 4: " "
+      RenderButton {INPUT} at (633,2) size 98x33 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 68x15
+          RenderText at (0,0) size 68x15
+            text run at (0,0) width 68: "Test Button"
+      RenderText {#text} at (733,7) size 4x19
+        text run at (733,7) width 4: " "
+      RenderButton {INPUT} at (2,44) size 103x34 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 73x16
+          RenderText at (0,0) size 73x16
+            text run at (0,0) width 73: "Test Button"
+      RenderText {#text} at (107,50) size 4x19
+        text run at (107,50) width 4: " "
+      RenderButton {INPUT} at (113,43) size 105x36 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 75x18
+          RenderText at (0,0) size 75x18
+            text run at (0,0) width 75: "Test Button"
+      RenderText {#text} at (220,50) size 4x19
+        text run at (220,50) width 4: " "
+      RenderButton {INPUT} at (226,42) size 111x37 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 81x19
+          RenderText at (0,0) size 81x19
+            text run at (0,0) width 81: "Test Button"
+      RenderText {#text} at (339,50) size 4x19
+        text run at (339,50) width 4: " "
+      RenderButton {INPUT} at (345,41) size 116x38 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 86x20
+          RenderText at (0,0) size 86x20
+            text run at (0,0) width 86: "Test Button"
+      RenderText {#text} at (463,50) size 4x19
+        text run at (463,50) width 4: " "
+      RenderButton {INPUT} at (469,40) size 122x39 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 92x21
+          RenderText at (0,0) size 92x21
+            text run at (0,0) width 92: "Test Button"
+      RenderText {#text} at (593,50) size 4x19
+        text run at (593,50) width 4: " "
+      RenderButton {INPUT} at (599,39) size 129x41 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 99x23
+          RenderText at (0,0) size 99x23
+            text run at (0,0) width 99: "Test Button"
+      RenderText {#text} at (730,50) size 4x19
+        text run at (730,50) width 4: " "
+      RenderButton {INPUT} at (2,85) size 133x42 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 103x24
+          RenderText at (0,0) size 103x24
+            text run at (0,0) width 103: "Test Button"
+      RenderText {#text} at (137,97) size 4x19
+        text run at (137,97) width 4: " "
+      RenderButton {INPUT} at (143,84) size 140x43 [color=#202020]
+        RenderBlock (anonymous) at (15,8) size 110x25
+          RenderText at (0,0) size 110x25
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
             text run at (0,0) width 110: "Test Button"
       RenderText {#text} at (0,0) size 0x0