tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/forms/button-text-transform-expected.txt b/LayoutTests/platform/efl/fast/forms/button-text-transform-expected.txt
index cb3fbe6..038ac25 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/button-text-transform-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/button-text-transform-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 40x14
@@ -49,5 +50,55 @@ layer at (0,0) size 800x600
         RenderButton {INPUT} at (251,2) size 102x36 [color=#202020]
           RenderBlock (anonymous) at (15,8) size 72x18
             RenderText at (0,0) size 72x17
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 53x19
+          text run at (0,0) width 53: "Test for "
+        RenderInline {I} at (0,0) size 746x38
+          RenderInline {A} at (0,0) size 301x19 [color=#0000EE]
+            RenderText {#text} at (53,0) size 301x19
+              text run at (53,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=15181"
+          RenderText {#text} at (354,0) size 746x38
+            text run at (354,0) width 4: " "
+            text run at (358,0) width 388: "text-transform: uppercase not working in input (submit, reset,"
+            text run at (0,19) width 104: "button) elements"
+        RenderText {#text} at (104,19) size 4x19
+          text run at (104,19) width 4: "."
+      RenderBlock {P} at (0,54) size 784x45
+        RenderButton {BUTTON} at (2,2) size 136x41 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (17,10) size 102x19
+            RenderText {#text} at (0,0) size 102x19
+              text run at (0,0) width 102: "UPPERCASE"
+        RenderText {#text} at (140,12) size 4x19
+          text run at (140,12) width 4: " "
+        RenderButton {BUTTON} at (146,2) size 107x41 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (17,10) size 73x19
+            RenderText {#text} at (0,0) size 73x19
+              text run at (0,0) width 73: "lowercase"
+        RenderText {#text} at (255,12) size 4x19
+          text run at (255,12) width 4: " "
+        RenderButton {BUTTON} at (261,2) size 106x41 [bgcolor=#C0C0C0] [border: (2px outset #C0C0C0)]
+          RenderBlock (anonymous) at (17,10) size 72x19
+            RenderText {#text} at (0,0) size 72x19
+              text run at (0,0) width 72: "Capitalize"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,115) size 784x41
+        RenderButton {INPUT} at (2,2) size 132x37 [color=#202020]
+          RenderBlock (anonymous) at (15,8) size 102x19
+            RenderText at (0,0) size 102x19
+              text run at (0,0) width 102: "UPPERCASE"
+        RenderText {#text} at (136,10) size 4x19
+          text run at (136,10) width 4: " "
+        RenderButton {INPUT} at (142,2) size 103x37 [color=#202020]
+          RenderBlock (anonymous) at (15,8) size 73x19
+            RenderText at (0,0) size 73x19
+              text run at (0,0) width 73: "lowercase"
+        RenderText {#text} at (247,10) size 4x19
+          text run at (247,10) width 4: " "
+        RenderButton {INPUT} at (253,2) size 102x37 [color=#202020]
+          RenderBlock (anonymous) at (15,8) size 72x19
+            RenderText at (0,0) size 72x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
               text run at (0,0) width 72: "Capitalize"
         RenderText {#text} at (0,0) size 0x0