tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / bugs / bug39209-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug39209-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug39209-expected.txt
index 56ade8f..948f1e0 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug39209-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug39209-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
       RenderTable {TABLE} at (0,0) size 325x92 [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 323x90
           RenderTableRow {TR} at (0,2) size 323x66
@@ -24,3 +25,26 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (2,70) size 319x18 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
               RenderText {#text} at (2,2) size 315x14
                 text run at (2,2) width 315: "This line is only here to separate the two columns in the row above"
+=======
+      RenderTable {TABLE} at (0,0) size 431x102 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 429x100
+          RenderTableRow {TR} at (0,2) size 429x71
+            RenderTableCell {TD} at (2,26) size 108x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 30x19
+                text run at (2,2) width 30: "Blah"
+            RenderTableCell {TD} at (112,2) size 315x71 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderTable {TABLE} at (110,2) size 94x67 [border: (1px outset #808080)]
+                RenderTableSection {TBODY} at (1,1) size 92x65
+                  RenderTableRow {TR} at (0,2) size 92x61
+                    RenderTableCell {TD} at (2,2) size 88x61 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+                      RenderBlock {FORM} at (2,2) size 84x41
+                        RenderButton {INPUT} at (2,2) size 80x37 [color=#202020]
+                          RenderBlock (anonymous) at (15,8) size 50x19
+                            RenderText at (0,0) size 50x19
+                              text run at (0,0) width 50: "Submit"
+                        RenderText {#text} at (0,0) size 0x0
+          RenderTableRow {TR} at (0,75) size 429x23
+            RenderTableCell {TD} at (2,75) size 425x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=2]
+              RenderText {#text} at (2,2) size 421x19
+                text run at (2,2) width 421: "This line is only here to separate the two columns in the row above"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d