tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css1 / box_properties / border_style_inline-expected.txt

diff --git a/LayoutTests/platform/efl/css1/box_properties/border_style_inline-expected.txt b/LayoutTests/platform/efl/css1/box_properties/border_style_inline-expected.txt
index 3ff01a7..ac576a9 100755 (executable)
--- a/LayoutTests/platform/efl/css1/box_properties/border_style_inline-expected.txt
+++ b/LayoutTests/platform/efl/css1/box_properties/border_style_inline-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 [bgcolor=#CCCCCC]
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 264x14
           text run at (0,0) width 264: "The style declarations which apply to the text below are:"
@@ -68,3 +69,70 @@ layer at (0,0) size 800x600
                   text run at (420,14) width 191: ", which should result in no border at all. "
                   text run at (611,14) width 133: "The line-height of the parent"
                   text run at (0,28) width 186: "element should not change, on any line."
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 355x19
+          text run at (0,0) width 355: "The style declarations which apply to the text below are:"
+      RenderBlock {PRE} at (0,35) size 784x45
+        RenderText {#text} at (0,0) size 568x45
+          text run at (0,0) width 560: ".one {border-style: dashed; border-color: black; border-width: thick;}"
+          text run at (560,0) width 0: " "
+          text run at (0,15) width 544: ".two {border-style: groove; border-color: red; border-width: thick;}"
+          text run at (544,15) width 0: " "
+          text run at (0,30) width 568: ".three {border-style: none; border-color: purple; border-width: thick;}"
+          text run at (568,30) width 0: " "
+      RenderBlock {HR} at (0,93) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {P} at (0,111) size 784x57 [bgcolor=#C0C0C0]
+        RenderText {#text} at (0,0) size 664x19
+          text run at (0,0) width 664: "This is an unstyled element, save for the background color, and it contains inline elements with classes of "
+        RenderInline {SPAN} at (0,0) size 67x29 [border: (5px dashed #000000)]
+          RenderText {#text} at (669,0) size 57x19
+            text run at (669,0) width 57: "class one"
+        RenderText {#text} at (731,0) size 778x38
+          text run at (731,0) width 47: ", which"
+          text run at (0,19) width 263: "will result in a dashed thick black border; "
+        RenderInline {SPAN} at (0,0) size 68x29 [border: (5px groove #FF0000)]
+          RenderText {#text} at (268,19) size 58x19
+            text run at (268,19) width 58: "class two"
+        RenderText {#text} at (331,19) size 373x19
+          text run at (331,19) width 373: ", which should result in a grooved thick purple border, and "
+        RenderInline {SPAN} at (0,0) size 65x19
+          RenderText {#text} at (704,19) size 65x19
+            text run at (704,19) width 65: "class three"
+        RenderText {#text} at (769,19) size 773x38
+          text run at (769,19) width 4: ","
+          text run at (0,38) width 246: "which should result in no border at all. "
+          text run at (246,38) width 433: "The line-height of the parent element should not change, on any line."
+      RenderTable {TABLE} at (0,184) size 784x94 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 782x92
+          RenderTableRow {TR} at (0,0) size 782x27
+            RenderTableCell {TD} at (0,0) size 782x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+              RenderInline {STRONG} at (0,0) size 163x19
+                RenderText {#text} at (4,4) size 163x19
+                  text run at (4,4) width 163: "TABLE Testing Section"
+          RenderTableRow {TR} at (0,27) size 782x65
+            RenderTableCell {TD} at (0,46) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 4x19
+                text run at (4,4) width 4: " "
+            RenderTableCell {TD} at (12,27) size 770x65 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderBlock {P} at (4,4) size 762x57 [bgcolor=#C0C0C0]
+                RenderText {#text} at (0,0) size 664x19
+                  text run at (0,0) width 664: "This is an unstyled element, save for the background color, and it contains inline elements with classes of "
+                RenderInline {SPAN} at (0,0) size 67x29 [border: (5px dashed #000000)]
+                  RenderText {#text} at (669,0) size 57x19
+                    text run at (669,0) width 57: "class one"
+                RenderText {#text} at (731,0) size 735x38
+                  text run at (731,0) width 4: ","
+                  text run at (0,19) width 306: "which will result in a dashed thick black border; "
+                RenderInline {SPAN} at (0,0) size 68x29 [border: (5px groove #FF0000)]
+                  RenderText {#text} at (311,19) size 58x19
+                    text run at (311,19) width 58: "class two"
+                RenderText {#text} at (374,19) size 369x19
+                  text run at (374,19) width 369: ", which should result in a grooved thick purple border, and"
+                RenderInline {SPAN} at (0,0) size 65x19
+                  RenderText {#text} at (0,38) size 65x19
+                    text run at (0,38) width 65: "class three"
+                RenderText {#text} at (65,38) size 687x19
+                  text run at (65,38) width 254: ", which should result in no border at all. "
+                  text run at (319,38) width 433: "The line-height of the parent element should not change, on any line."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d