tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/forms/text-style-color-expected.txt b/LayoutTests/platform/efl/fast/forms/text-style-color-expected.txt
index de58970..9235efe 100755 (executable)
--- a/LayoutTests/platform/efl/fast/forms/text-style-color-expected.txt
+++ b/LayoutTests/platform/efl/fast/forms/text-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
       RenderBlock (anonymous) at (0,0) size 784x14
         RenderText {#text} at (0,0) size 125x14
           text run at (0,0) width 125: "The text should be default:"
@@ -90,4 +91,93 @@ layer at (415,328) size 187x18
 layer at (13,357) size 187x18
   RenderBlock {DIV} at (3,3) size 187x18
     RenderText {#text} at (1,0) size 90x17
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 168x19
+          text run at (0,0) width 168: "The text should be default:"
+      RenderBlock {FORM} at (0,27) size 784x53
+        RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+        RenderBlock (anonymous) at (0,10) size 784x33
+          RenderInline {LABEL} at (0,0) size 521x19
+            RenderText {#text} at (0,8) size 322x19
+              text run at (0,8) width 322: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (324,2) size 195x29 [color=#202020]
+        RenderBlock {HR} at (0,51) size 784x2 [border: (1px inset #000000)]
+      RenderBlock (anonymous) at (0,96) size 784x19
+        RenderText {#text} at (0,0) size 145x19
+          text run at (0,0) width 145: "The text should be red:"
+      RenderBlock {FORM} at (0,123) size 784x53
+        RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+        RenderBlock (anonymous) at (0,10) size 784x33
+          RenderInline {LABEL} at (0,0) size 521x19
+            RenderText {#text} at (0,8) size 322x19
+              text run at (0,8) width 322: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (324,2) size 195x29 [color=#202020]
+        RenderBlock {HR} at (0,51) size 784x2 [border: (1px inset #000000)]
+      RenderBlock (anonymous) at (0,192) size 784x19
+        RenderText {#text} at (0,0) size 212x19
+          text run at (0,0) width 212: "The text should be gray on green:"
+      RenderBlock {FORM} at (0,219) size 784x49
+        RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+        RenderBlock (anonymous) at (0,10) size 784x29
+          RenderInline {LABEL} at (0,0) size 520x19
+            RenderText {#text} at (0,5) size 322x19
+              text run at (0,5) width 322: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (324,2) size 194x25 [bgcolor=#008000] [border: (2px inset #000000)]
+        RenderBlock {HR} at (0,47) size 784x2 [border: (1px inset #000000)]
+      RenderBlock (anonymous) at (0,284) size 784x19
+        RenderText {#text} at (0,0) size 208x19
+          text run at (0,0) width 208: "The text should be red on Green:"
+      RenderBlock {FORM} at (0,311) size 784x49
+        RenderBlock {HR} at (0,0) size 784x2 [border: (1px inset #000000)]
+        RenderBlock (anonymous) at (0,10) size 784x29
+          RenderInline {LABEL} at (0,0) size 520x19
+            RenderText {#text} at (0,5) size 322x19
+              text run at (0,5) width 322: "This is a searchable index. Enter search keywords: "
+            RenderTextControl {INPUT} at (324,2) size 194x25 [color=#FF0000] [bgcolor=#008000] [border: (2px inset #FF0000)]
+        RenderBlock {HR} at (0,47) size 784x2 [border: (1px inset #000000)]
+      RenderBlock (anonymous) at (0,376) size 784x62
+        RenderTextControl {INPUT} at (2,2) size 195x29 [color=#202020]
+        RenderText {#text} at (199,8) size 4x19
+          text run at (199,8) width 4: " "
+        RenderTextControl {INPUT} at (205,2) size 195x29 [color=#202020]
+        RenderText {#text} at (402,8) size 4x19
+          text run at (402,8) width 4: " "
+        RenderTextControl {INPUT} at (408,5) size 194x25 [bgcolor=#008000] [border: (2px inset #000000)]
+        RenderText {#text} at (604,8) size 4x19
+          text run at (604,8) width 4: " "
+        RenderTextControl {INPUT} at (2,35) size 194x25 [color=#FF0000] [bgcolor=#008000] [border: (2px inset #FF0000)]
+        RenderText {#text} at (0,0) size 0x0
+layer at (336,53) size 188x19
+  RenderBlock {DIV} at (4,6) size 188x19
+    RenderText {#text} at (1,0) size 48x19
+      text run at (1,0) width 48: "default"
+layer at (336,149) size 188x19
+  RenderBlock {DIV} at (4,6) size 188x19
+    RenderText {#text} at (1,0) size 23x19
+      text run at (1,0) width 23: "red"
+layer at (335,242) size 188x19
+  RenderBlock {DIV} at (3,3) size 188x19
+    RenderText {#text} at (1,0) size 115x19
+      text run at (1,0) width 115: "default on green"
+layer at (335,334) size 188x19
+  RenderBlock {DIV} at (3,3) size 188x19
+    RenderText {#text} at (1,0) size 90x19
+      text run at (1,0) width 90: "red on green"
+layer at (14,392) size 188x19
+  RenderBlock {DIV} at (4,6) size 188x19
+    RenderText {#text} at (1,0) size 48x19
+      text run at (1,0) width 48: "default"
+layer at (217,392) size 188x19
+  RenderBlock {DIV} at (4,6) size 188x19
+    RenderText {#text} at (1,0) size 23x19
+      text run at (1,0) width 23: "red"
+layer at (419,392) size 188x19
+  RenderBlock {DIV} at (3,3) size 188x19
+    RenderText {#text} at (1,0) size 115x19
+      text run at (1,0) width 115: "default on green"
+layer at (13,422) size 188x19
+  RenderBlock {DIV} at (3,3) size 188x19
+    RenderText {#text} at (1,0) size 90x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
       text run at (1,0) width 90: "red on green"