tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/forms/menulist-clip-expected.txt b/LayoutTests/platform/efl/fast/forms/menulist-clip-expected.txt
index 5d51cab..7b21bee 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/menulist-clip-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/menulist-clip-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 {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 88x14
           text run at (0,0) width 88: "Rendering test for "
@@ -19,5 +20,24 @@ layer at (0,0) size 800x600
         RenderMenuList {SELECT} at (2,0) size 48x30 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
           RenderBlock (anonymous) at (1,4) size 46x21
             RenderText at (0,0) size 46x20
+=======
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 117x19
+          text run at (0,0) width 117: "Rendering test for "
+        RenderInline {I} at (0,0) size 766x38
+          RenderInline {A} at (0,0) size 301x19 [color=#0000EE]
+            RenderText {#text} at (117,0) size 301x19
+              text run at (117,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=15156"
+          RenderText {#text} at (418,0) size 766x38
+            text run at (418,0) width 4: " "
+            text run at (422,0) width 344: "REGRESSION (r24594-r24668): The bottom of styled"
+            text run at (0,19) width 215: "<select> button text is clipped out"
+        RenderText {#text} at (215,19) size 4x19
+          text run at (215,19) width 4: "."
+      RenderBlock (anonymous) at (0,54) size 784x30
+        RenderMenuList {SELECT} at (2,0) size 48x30 [bgcolor=#FFFFFF] [border: (1px solid #000000)]
+          RenderBlock (anonymous) at (1,4) size 46x21
+            RenderText at (0,0) size 46x21
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
               text run at (0,0) width 46: "Apple"
         RenderText {#text} at (0,0) size 0x0