tizen beta release

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

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug10633-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug10633-expected.txt
index 19eb95d..e93e1a8 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug10633-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug10633-expected.txt
@@ -3,8 +3,13 @@ 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 [bgcolor=#FFFFFF]
+<<<<<<< HEAD
       RenderTable {TABLE} at (0,0) size 468x76
         RenderTableSection {TBODY} at (0,0) size 468x76
+=======
+      RenderTable {TABLE} at (0,0) size 468x103
+        RenderTableSection {TBODY} at (0,0) size 468x103
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
           RenderTableRow {TR} at (0,0) size 468x1
             RenderTableCell {TD} at (0,0) size 18x0 [r=0 c=0 rs=1 cs=3]
             RenderTableCell {TD} at (18,0) size 187x1 [r=0 c=3 rs=1 cs=1]
@@ -21,6 +26,7 @@ layer at (0,0) size 800x600
           RenderTableRow {TR} at (0,1) size 468x22
             RenderTableCell {TD} at (0,1) size 18x22 [r=1 c=0 rs=1 cs=3]
               RenderImage {IMG} at (0,0) size 18x22
+<<<<<<< HEAD
             RenderTableCell {TD} at (18,5) size 187x14 [bgcolor=#FFCC00] [r=1 c=3 rs=1 cs=1]
               RenderInline {A} at (0,0) size 91x14 [color=#0000EE]
                 RenderInline {B} at (0,0) size 91x14
@@ -81,3 +87,68 @@ layer at (0,0) size 800x600
                 RenderText {#text} at (0,5) size 175x23
                   text run at (0,5) width 175: "Search for businesses within a certain"
                   text run at (0,17) width 168: "distance from a location you specify."
+=======
+            RenderTableCell {TD} at (18,2) size 187x19 [bgcolor=#FFCC00] [r=1 c=3 rs=1 cs=1]
+              RenderInline {A} at (0,0) size 121x19 [color=#0000EE]
+                RenderInline {B} at (0,0) size 121x19
+                  RenderInline {FONT} at (0,0) size 121x19
+                    RenderText {#text} at (33,0) size 121x19
+                      text run at (33,0) width 121: "Detailed Search"
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (205,1) size 20x22 [r=1 c=4 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x22
+            RenderTableCell {TD} at (225,2) size 18x19 [r=1 c=5 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 4x19
+                text run at (0,0) width 4: " "
+            RenderTableCell {TD} at (243,1) size 18x22 [r=1 c=6 rs=1 cs=3]
+              RenderImage {IMG} at (0,0) size 18x22
+            RenderTableCell {TD} at (261,2) size 187x19 [bgcolor=#FFCC00] [r=1 c=9 rs=1 cs=1]
+              RenderInline {A} at (0,0) size 151x19 [color=#0000EE]
+                RenderInline {B} at (0,0) size 151x19
+                  RenderInline {FONT} at (0,0) size 151x19
+                    RenderText {#text} at (18,0) size 151x19
+                      text run at (18,0) width 151: "Search By Distance"
+              RenderText {#text} at (0,0) size 0x0
+            RenderTableCell {TD} at (448,1) size 20x22 [r=1 c=10 rs=1 cs=1]
+              RenderImage {IMG} at (0,0) size 20x22
+          RenderTableRow {TR} at (0,23) size 468x80
+            RenderTableCell {TD} at (0,53) size 6x19 [r=2 c=0 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 4x19
+                text run at (0,0) width 4: " "
+            RenderTableCell {TD} at (6,53) size 6x19 [bgcolor=#EBEBE4] [r=2 c=1 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 4x19
+                text run at (0,0) width 4: " "
+            RenderTableCell {TD} at (12,23) size 213x80 [bgcolor=#EBEBE4] [r=2 c=2 rs=1 cs=3]
+              RenderBlock {P} at (0,0) size 213x80
+                RenderImage {IMG} at (0,0) size 1x5
+                RenderBR {BR} at (1,5) size 0x0
+                RenderInline {FONT} at (0,0) size 211x60
+                  RenderText {#text} at (0,5) size 211x60
+                    text run at (0,5) width 123: "Search using almost "
+                    text run at (123,5) width 21: "any"
+                    text run at (0,20) width 181: "combination of business name,"
+                    text run at (0,35) width 178: "category, street address, city, "
+                    text run at (178,35) width 33: "state,"
+                    text run at (0,50) width 130: "ZIP, or phone number."
+                RenderInline {FONT} at (0,0) size 130x30
+                  RenderBR {BR} at (130,62) size 0x0
+                  RenderText {#text} at (0,65) size 4x15
+                    text run at (0,65) width 4: " "
+            RenderTableCell {TD} at (225,53) size 18x19 [r=2 c=5 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 4x19
+                text run at (0,0) width 4: " "
+            RenderTableCell {TD} at (243,53) size 7x19 [r=2 c=6 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 4x19
+                text run at (0,0) width 4: " "
+            RenderTableCell {TD} at (250,53) size 7x19 [bgcolor=#EBEBE4] [r=2 c=7 rs=1 cs=1]
+              RenderText {#text} at (0,0) size 4x19
+                text run at (0,0) width 4: " "
+            RenderTableCell {TD} at (257,23) size 211x50 [bgcolor=#EBEBE4] [r=2 c=8 rs=1 cs=3]
+              RenderInline {FONT} at (0,0) size 207x57
+                RenderImage {IMG} at (0,0) size 1x5
+                RenderBR {BR} at (1,5) size 0x0
+                RenderText {#text} at (0,5) size 207x45
+                  text run at (0,5) width 178: "Search for businesses within a"
+                  text run at (0,20) width 207: "certain distance from a location you"
+                  text run at (0,35) width 46: "specify."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d