tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug4527-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug4527-expected.txt
index 309abc0..0c63212 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug4527-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug4527-expected.txt
@@ -6,6 +6,7 @@ layer at (0,0) size 800x600
       RenderBlock (anonymous) at (0,0) size 784x0
         RenderInline {BASEFONT} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderTable {TABLE} at (0,0) size 613x120
         RenderTableSection {TBODY} at (0,0) size 613x120
           RenderTableRow {TR} at (0,0) size 613x70
@@ -15,6 +16,17 @@ layer at (0,0) size 800x600
               RenderText {#text} at (0,0) size 0x0
             RenderTableCell {TD} at (126,0) size 487x70 [r=0 c=1 rs=1 cs=3]
               RenderInline {NOBR} at (0,0) size 19x14
+=======
+      RenderTable {TABLE} at (0,0) size 613x121
+        RenderTableSection {TBODY} at (0,0) size 613x121
+          RenderTableRow {TR} at (0,0) size 613x70
+            RenderTableCell {TD} at (0,18) size 126x85 [r=0 c=0 rs=2 cs=1]
+              RenderInline {A} at (0,0) size 126x19 [color=#0000EE]
+                RenderImage {IMG} at (0,0) size 126x85
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (126,0) size 487x70 [r=0 c=1 rs=1 cs=3]
+              RenderInline {NOBR} at (0,0) size 19x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
                 RenderPartObject {IFRAME} at (0,0) size 468x60
                   layer at (0,0) size 468x60
                     RenderView at (0,0) size 468x60
@@ -23,15 +35,24 @@ layer at (0,0) size 800x600
                       RenderBody {BODY} at (0,0) size 468x60
                         RenderInline {BASE} at (0,0) size 0x0
                         RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
                         RenderInline {A} at (0,0) size 468x14 [color=#0000EE]
                           RenderText {#text} at (0,0) size 0x0
                           RenderImage {IMG} at (0,0) size 468x60
                         RenderText {#text} at (0,0) size 0x0
                 RenderInline {A} at (0,0) size 19x14 [color=#0000EE]
+=======
+                        RenderInline {A} at (0,0) size 468x19 [color=#0000EE]
+                          RenderText {#text} at (0,0) size 0x0
+                          RenderImage {IMG} at (0,0) size 468x60
+                        RenderText {#text} at (0,0) size 0x0
+                RenderInline {A} at (0,0) size 19x19 [color=#0000EE]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
                   RenderImage {IMG} at (468,0) size 19x60
               RenderBR {BR} at (487,60) size 0x0
               RenderImage {IMG} at (0,60) size 470x10
               RenderBR {BR} at (470,70) size 0x0
+<<<<<<< HEAD
           RenderTableRow {TR} at (0,70) size 613x50
             RenderTableCell {TD} at (126,82) size 232x25 [bgcolor=#CCCCCC] [r=1 c=1 rs=1 cs=1]
               RenderImage {IMG} at (0,0) size 232x25
@@ -46,3 +67,19 @@ layer at (0,0) size 800x600
               RenderImage {IMG} at (0,25) size 46x25
 layer at (383,86) size 97x18
   RenderBlock {DIV} at (4,6) size 97x18
+=======
+          RenderTableRow {TR} at (0,70) size 613x51
+            RenderTableCell {TD} at (126,83) size 232x25 [bgcolor=#CCCCCC] [r=1 c=1 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 232x25
+            RenderTableCell {TD} at (358,70) size 129x51 [bgcolor=#CCCCCC] [r=1 c=2 rs=1 cs=1]
+              RenderTextControl {INPUT} at (12,2) size 105x29 [color=#202020]
+              RenderImage {INPUT} at (52,33) size 25x18
+            RenderTableCell {TD} at (487,70) size 126x50 [bgcolor=#CCCCCC] [r=1 c=3 rs=1 cs=1]
+              RenderBlock {INPUT} at (4,7) size 12x12
+              RenderImage {IMG} at (20,0) size 40x25
+              RenderBlock {INPUT} at (64,7) size 12x12
+              RenderText {#text} at (0,0) size 0x0
+              RenderImage {IMG} at (0,25) size 46x25
+layer at (382,86) size 98x19
+  RenderBlock {DIV} at (4,6) size 98x19
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d