X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ftables%2Fmozilla%2Fmarvin%2Ftables_td_width-expected.txt;h=d05770eff6781dd2f05fe972eca16a79bc005dfb;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=b0a1ad6c8ee371e9d8a8081b5caba2fbbad08549;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_td_width-expected.txt b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_td_width-expected.txt
index b0a1ad6..d05770e 100755
--- a/LayoutTests/platform/efl/tables/mozilla/marvin/tables_td_width-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/marvin/tables_td_width-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
       RenderBlock (anonymous) at (0,0) size 784x14
         RenderText {#text} at (0,0) size 400x14
           text run at (0,0) width 400: "The TD tag uses the WIDTH attribute. The first table's TD width is set to 500 pixels."
@@ -32,3 +33,35 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (2,22) size 204x18 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
               RenderText {#text} at (2,2) size 46x14
                 text run at (2,2) width 46: "Platforms"
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 535x19
+          text run at (0,0) width 535: "The TD tag uses the WIDTH attribute. The first table's TD width is set to 500 pixels."
+        RenderBR {BR} at (535,15) size 0x0
+      RenderTable {TABLE} at (0,19) size 610x54 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 608x52
+          RenderTableRow {TR} at (0,2) size 608x23
+            RenderTableCell {TD} at (2,2) size 604x23 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 246x19
+                text run at (2,2) width 246: "Netscape Communicator Version 4.0.6"
+          RenderTableRow {TR} at (0,27) size 608x23
+            RenderTableCell {TD} at (2,27) size 604x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 60x19
+                text run at (2,2) width 60: "Platforms"
+      RenderBlock (anonymous) at (0,73) size 784x38
+        RenderBR {BR} at (0,0) size 0x19
+        RenderText {#text} at (0,19) size 309x19
+          text run at (0,19) width 309: "This second table's TD width is set to 200 pixels."
+        RenderBR {BR} at (309,34) size 0x0
+      RenderTable {TABLE} at (0,111) size 210x73 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 208x71
+          RenderTableRow {TR} at (0,2) size 208x42
+            RenderTableCell {TD} at (2,2) size 204x42 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 156x38
+                text run at (2,2) width 156: "Netscape Communicator"
+                text run at (2,21) width 86: "Version 4.0.6"
+          RenderTableRow {TR} at (0,46) size 208x23
+            RenderTableCell {TD} at (2,46) size 204x23 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (2,2) size 60x19
+                text run at (2,2) width 60: "Platforms"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d