tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css2.1 / t0805-c5522-brdr-02-e-expected.txt

diff --git a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt
index 0490d6e..2921569 100755 (executable)
--- a/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt
+++ b/LayoutTests/platform/efl/css2.1/t0805-c5522-brdr-02-e-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x72
   RenderBlock {HTML} at (0,0) size 800x72
     RenderBody {BODY} at (8,8) size 784x56 [color=#0000FF]
@@ -28,3 +29,33 @@ layer at (0,0) size 800x72
                           text run at (99,3) width 68: " blue borders"
                       RenderText {#text} at (167,3) size 102x14
                         text run at (167,3) width 102: " around this sentence."
+=======
+layer at (0,0) size 800x82
+  RenderBlock {HTML} at (0,0) size 800x82
+    RenderBody {BODY} at (8,8) size 784x66 [color=#0000FF]
+      RenderTable {TABLE} at (0,0) size 708x66
+        RenderTableSection {TBODY} at (0,0) size 708x66
+          RenderTableRow {TR} at (0,2) size 708x25
+            RenderTableCell {TD} at (2,2) size 704x25 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=2]
+              RenderText {#text} at (3,3) size 325x19
+                text run at (3,3) width 325: "There should be a blue border around this sentence."
+          RenderTableRow {TR} at (0,29) size 708x35
+            RenderTableCell {TD} at (2,34) size 331x25 [border: (2px solid #0000FF)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (3,3) size 325x19
+                text run at (3,3) width 325: "There should be a blue border around this sentence."
+            RenderTableCell {TD} at (335,29) size 371x35 [border: (2px solid #0000FF)] [r=1 c=1 rs=1 cs=1]
+              RenderTable {TABLE} at (3,3) size 365x29
+                RenderTableSection {TBODY} at (0,0) size 365x29
+                  RenderTableRow {TR} at (0,2) size 365x25
+                    RenderTableCell {TD} at (2,2) size 361x25 [border: (2px solid #0000FF)] [r=0 c=0 rs=1 cs=1]
+                      RenderText {#text} at (3,3) size 106x19
+                        text run at (3,3) width 106: "There should be "
+                      RenderInline {STRONG} at (0,0) size 113x19
+                        RenderInline {EM} at (0,0) size 23x19
+                          RenderText {#text} at (109,3) size 23x19
+                            text run at (109,3) width 23: "two"
+                        RenderText {#text} at (132,3) size 90x19
+                          text run at (132,3) width 90: " blue borders"
+                      RenderText {#text} at (222,3) size 136x19
+                        text run at (222,3) width 136: " around this sentence."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d