tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug14323-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug14323-expected.txt
index dc57347..75a192a 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug14323-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug14323-expected.txt
@@ -4,6 +4,7 @@ layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584 [bgcolor=#FFFFFF]
       RenderBlock {HR} at (0,0) size 152x2 [border: (1px inset #000000)]
+<<<<<<< HEAD
       RenderTable {TABLE} at (0,8) size 150x49 [bgcolor=#F7D68C] [border: (1px outset #808080)]
         RenderTableSection {TBODY} at (1,1) size 148x47
           RenderTableRow {TR} at (0,0) size 148x47
@@ -40,4 +41,42 @@ layer at (0,0) size 800x600
             RenderTableCell {TD} at (0,16) size 326x30 [r=1 c=0 rs=1 cs=1]
               RenderImage {IMG} at (0,0) size 326x30
             RenderTableCell {TD} at (326,16) size 100x30 [r=1 c=1 rs=1 cs=1]
+=======
+      RenderTable {TABLE} at (0,10) size 184x49 [bgcolor=#F7D68C] [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 182x47
+          RenderTableRow {TR} at (0,0) size 182x47
+            RenderTableCell {TD} at (0,3) size 138x40 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1]
+              RenderText {#text} at (1,1) size 136x38
+                text run at (1,1) width 136: "xxxxxxxxxxxxxxxxx"
+                text run at (1,20) width 100: "xxxxxx xxxxxx"
+            RenderTableCell {TD} at (138,0) size 44x47 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1]
+              RenderImage {IMG} at (1,1) size 21x45
+              RenderImage {IMG} at (22,1) size 21x45
+      RenderBlock (anonymous) at (0,59) size 784x19
+        RenderBR {BR} at (0,0) size 0x19
+      RenderTable {TABLE} at (0,78) size 468x72 [bgcolor=#F7D68C]
+        RenderTableSection {TBODY} at (0,0) size 468x72
+          RenderTableRow {TR} at (0,0) size 468x42
+            RenderTableCell {TD} at (0,0) size 326x21 [r=0 c=0 rs=1 cs=1]
+              RenderInline {FONT} at (0,0) size 264x21
+                RenderInline {B} at (0,0) size 264x21
+                  RenderText {#text} at (0,0) size 264x21
+                    text run at (0,0) width 264: " 25 offres d'emploi des entreprises"
+            RenderTableCell {TD} at (326,0) size 100x42 [bgcolor=#EE9E02] [r=0 c=1 rs=1 cs=1]
+              RenderImage {IMG} at (18,16) size 20x1
+              RenderText {#text} at (38,0) size 34x19
+                text run at (38,0) width 34: "page "
+              RenderInline {FONT} at (0,0) size 28x42
+                RenderInline {B} at (0,0) size 28x42
+                  RenderText {#text} at (72,0) size 28x42
+                    text run at (72,0) width 28: "12 /"
+                    text run at (82,21) width 18: "13"
+            RenderTableCell {TD} at (426,0) size 42x45 [r=0 c=2 rs=2 cs=1]
+              RenderImage {IMG} at (0,0) size 21x45
+              RenderImage {IMG} at (21,0) size 21x45
+          RenderTableRow {TR} at (0,42) size 468x30
+            RenderTableCell {TD} at (0,42) size 326x30 [r=1 c=0 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 326x30
+            RenderTableCell {TD} at (326,42) size 100x30 [r=1 c=1 rs=1 cs=1]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
               RenderImage {IMG} at (0,0) size 100x30