tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / table / 003-expected.txt

diff --git a/LayoutTests/platform/efl/fast/table/003-expected.txt b/LayoutTests/platform/efl/fast/table/003-expected.txt
index 93e0f30..6a79caf 100755 (executable)
--- a/LayoutTests/platform/efl/fast/table/003-expected.txt
+++ b/LayoutTests/platform/efl/fast/table/003-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 784x56
         RenderTableSection {TBODY} at (0,0) size 784x56
           RenderTableRow {TR} at (0,2) size 784x34
@@ -77,3 +78,81 @@ layer at (46,19) size 740x18
 layer at (16,235) size 187x38
   RenderTextControl {TEXTAREA} at (4,2) size 187x38 [color=#202020]
     RenderBlock {DIV} at (4,6) size 180x18
+=======
+      RenderTable {TABLE} at (0,0) size 784x62
+        RenderTableSection {TBODY} at (0,0) size 784x62
+          RenderTableRow {TR} at (0,2) size 784x35
+            RenderTableCell {TD} at (2,9) size 41x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 37x19
+                text run at (1,1) width 37: "URL:"
+            RenderTableCell {TD} at (45,2) size 737x35 [r=0 c=1 rs=1 cs=1]
+              RenderTextControl {INPUT} at (1,3) size 735x29 [color=#202020]
+          RenderTableRow {TR} at (0,39) size 784x21
+            RenderTableCell {TD} at (2,39) size 780x21 [bgcolor=#FF0000] [r=1 c=0 rs=1 cs=2]
+              RenderText {#text} at (1,1) size 253x19
+                text run at (1,1) width 253: "Alongwordtogiveyouanicebigminwidth."
+      RenderTable {TABLE} at (0,62) size 100x100 [bgcolor=#FF0000] [border: (2px outset #808080)]
+        RenderTableSection {TBODY} at (2,2) size 96x96
+          RenderTableRow {TR} at (0,2) size 96x92
+            RenderTableCell {TD} at (2,46) size 92x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+      RenderTable {TABLE} at (0,162) size 218x120 [border: (2px outset #808080)]
+        RenderTableSection {TBODY} at (2,2) size 214x116
+          RenderTableRow {TR} at (0,2) size 214x23
+            RenderTableCell {TD} at (2,2) size 210x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 31x19
+                text run at (2,2) width 31: "hello"
+          RenderTableRow {TR} at (0,27) size 214x23
+            RenderTableCell {TD} at (2,27) size 210x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 67x19
+                text run at (2,2) width 67: "more hello"
+          RenderTableRow {TR} at (0,52) size 214x23
+            RenderTableCell {TD} at (2,52) size 210x23 [border: (1px inset #808080)] [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 37x19
+                text run at (2,2) width 37: "world"
+          RenderTableRow {TR} at (0,77) size 214x37
+            RenderTableCell {TD} at (2,82) size 210x27 [border: (1px inset #808080)] [r=3 c=0 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 0x0
+      RenderTable {TABLE} at (0,282) size 106x82
+        RenderTableSection {TBODY} at (0,0) size 106x82
+          RenderTableRow {TR} at (0,2) size 106x78
+            RenderTableCell {TD} at (2,2) size 102x78 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 100x76
+                text run at (1,1) width 87: "I should wrap"
+                text run at (1,20) width 81: "and not have"
+                text run at (1,39) width 56: "nowrap. "
+                text run at (57,39) width 44: "I really"
+                text run at (1,58) width 46: "should."
+      RenderTable {TABLE} at (0,364) size 106x82
+        RenderTableSection {TBODY} at (0,0) size 106x82
+          RenderTableRow {TR} at (0,2) size 106x78
+            RenderTableCell {TD} at (2,2) size 102x78 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 100x76
+                RenderText {#text} at (0,0) size 100x76
+                  text run at (0,0) width 87: "I should wrap"
+                  text run at (0,19) width 81: "and not have"
+                  text run at (0,38) width 56: "nowrap. "
+                  text run at (56,38) width 44: "I really"
+                  text run at (0,57) width 46: "should."
+      RenderTable {TABLE} at (0,446) size 369x25
+        RenderTableSection {TBODY} at (0,0) size 369x25
+          RenderTableRow {TR} at (0,2) size 369x21
+            RenderTableCell {TD} at (2,2) size 365x21 [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 363x19
+                text run at (1,1) width 145: "I should have nowrap. "
+                text run at (146,1) width 98: "I really should. "
+                text run at (244,1) width 120: "Definitely. Should."
+      RenderTable {TABLE} at (0,471) size 369x25
+        RenderTableSection {TBODY} at (0,0) size 369x25
+          RenderTableRow {TR} at (0,2) size 369x21
+            RenderTableCell {TD} at (2,2) size 365x21 [r=0 c=0 rs=1 cs=1]
+              RenderBlock {DIV} at (1,1) size 363x19
+                RenderText {#text} at (0,0) size 363x19
+                  text run at (0,0) width 145: "I should have nowrap. "
+                  text run at (145,0) width 98: "I really should. "
+                  text run at (243,0) width 120: "Definitely. Should."
+layer at (58,19) size 728x19
+  RenderBlock {DIV} at (4,6) size 728x19
+layer at (16,256) size 202x23 clip at (16,256) size 187x23 scrollHeight 29
+  RenderTextControl {TEXTAREA} at (4,2) size 202x23 [color=#202020]
+    RenderBlock {DIV} at (4,6) size 180x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d