tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / forms / menulist-style-color-expected.txt

diff --git a/LayoutTests/platform/efl/fast/forms/menulist-style-color-expected.txt b/LayoutTests/platform/efl/fast/forms/menulist-style-color-expected.txt
index 10849bb..9a364f6 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/menulist-style-color-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/menulist-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
       RenderMenuList {SELECT} at (2,2) size 107x38 [color=#202020]
         RenderBlock (anonymous) at (15,10) size 51x18
           RenderText at (0,0) size 51x17
@@ -24,5 +25,28 @@ layer at (0,0) size 800x600
       RenderMenuList {SELECT} at (390,2) size 153x38 [color=#202020]
         RenderBlock (anonymous) at (15,10) size 97x18
           RenderText at (0,0) size 97x17
+=======
+      RenderMenuList {SELECT} at (2,2) size 107x39 [color=#202020]
+        RenderBlock (anonymous) at (15,10) size 51x19
+          RenderText at (0,0) size 51x19
+            text run at (0,0) width 51: "Default"
+      RenderText {#text} at (111,12) size 4x19
+        text run at (111,12) width 4: " "
+      RenderMenuList {SELECT} at (117,2) size 86x39 [color=#202020]
+        RenderBlock (anonymous) at (15,10) size 30x19
+          RenderText at (0,0) size 30x19
+            text run at (0,0) width 30: "Red"
+      RenderText {#text} at (205,12) size 4x19
+        text run at (205,12) width 4: " "
+      RenderMenuList {SELECT} at (211,2) size 174x39 [color=#202020]
+        RenderBlock (anonymous) at (15,10) size 118x19
+          RenderText at (0,0) size 118x19
+            text run at (0,0) width 118: "Default on green"
+      RenderText {#text} at (387,12) size 4x19
+        text run at (387,12) width 4: " "
+      RenderMenuList {SELECT} at (393,2) size 153x39 [color=#202020]
+        RenderBlock (anonymous) at (15,10) size 97x19
+          RenderText at (0,0) size 97x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
             text run at (0,0) width 97: "Red on green"
       RenderText {#text} at (0,0) size 0x0