tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / fast / forms / button-style-color-expected.txt

diff --git a/LayoutTests/platform/efl/fast/forms/button-style-color-expected.txt b/LayoutTests/platform/efl/fast/forms/button-style-color-expected.txt
index 4354217..cf3428f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/button-style-color-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/button-style-color-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 {BUTTON} at (2,2) size 115x40 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
         RenderBlock (anonymous) at (17,10) size 81x18
           RenderText {#text} at (0,0) size 81x17
@@ -48,5 +49,52 @@ layer at (0,0) size 800x600
       RenderButton {INPUT} at (106,46) size 97x27 [color=#FF0000] [bgcolor=#008000] [border: (2px outset #C0C0C0)]
         RenderBlock (anonymous) at (8,4) size 81x18
           RenderText at (0,0) size 81x17
+=======
+      RenderButton {BUTTON} at (2,2) size 115x41 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+        RenderBlock (anonymous) at (17,10) size 81x19
+          RenderText {#text} at (0,0) size 81x19
+            text run at (0,0) width 81: "Test Button"
+      RenderText {#text} at (119,12) size 4x19
+        text run at (119,12) width 4: " "
+      RenderButton {BUTTON} at (125,2) size 115x41 [color=#FF0000] [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+        RenderBlock (anonymous) at (17,10) size 81x19
+          RenderText {#text} at (0,0) size 81x19
+            text run at (0,0) width 81: "Test Button"
+      RenderText {#text} at (242,12) size 4x19
+        text run at (242,12) width 4: " "
+      RenderButton {BUTTON} at (248,8) size 97x28 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+        RenderBlock (anonymous) at (8,4) size 81x19
+          RenderText {#text} at (0,0) size 81x19
+            text run at (0,0) width 81: "Test Button"
+      RenderText {#text} at (347,12) size 4x19
+        text run at (347,12) width 4: " "
+      RenderButton {BUTTON} at (353,8) size 97x28 [color=#FF0000] [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+        RenderBlock (anonymous) at (8,4) size 81x19
+          RenderText {#text} at (0,0) size 81x19
+            text run at (0,0) width 81: "Test Button"
+      RenderText {#text} at (452,12) size 4x19
+        text run at (452,12) width 4: " "
+      RenderButton {INPUT} at (458,4) 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 (571,12) size 4x19
+        text run at (571,12) width 4: " "
+      RenderButton {INPUT} at (577,4) 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 (690,12) size 4x19
+        text run at (690,12) width 4: " "
+      RenderButton {INPUT} at (2,47) size 97x28 [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+        RenderBlock (anonymous) at (8,4) size 81x19
+          RenderText at (0,0) size 81x19
+            text run at (0,0) width 81: "Test Button"
+      RenderText {#text} at (101,51) size 4x19
+        text run at (101,51) width 4: " "
+      RenderButton {INPUT} at (107,47) size 97x28 [color=#FF0000] [bgcolor=#008000] [border: (2px outset #C0C0C0)]
+        RenderBlock (anonymous) at (8,4) size 81x19
+          RenderText at (0,0) size 81x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
             text run at (0,0) width 81: "Test Button"
       RenderText {#text} at (0,0) size 0x0