tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css1 / box_properties / height-expected.txt

diff --git a/LayoutTests/platform/efl/css1/box_properties/height-expected.txt b/LayoutTests/platform/efl/css1/box_properties/height-expected.txt
index 1637c4b..3fc602c 100755 (executable)
--- a/LayoutTests/platform/efl/css1/box_properties/height-expected.txt
+++ b/LayoutTests/platform/efl/css1/box_properties/height-expected.txt
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
 layer at (0,0) size 800x841
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x841
@@ -72,3 +73,81 @@ layer at (0,0) size 800x841
                     text run at (675,3) width 36: "height"
                 RenderText {#text} at (711,0) size 50x14
                   text run at (711,0) width 50: " property)."
+=======
+layer at (0,0) size 785x984
+  RenderView at (0,0) size 785x600
+layer at (0,0) size 785x984
+  RenderBlock {HTML} at (0,0) size 785x984
+    RenderBody {BODY} at (8,8) size 769x968 [bgcolor=#CCCCCC]
+      RenderBlock {P} at (0,0) size 769x19
+        RenderText {#text} at (0,0) size 355x19
+          text run at (0,0) width 355: "The style declarations which apply to the text below are:"
+      RenderBlock {PRE} at (0,35) size 769x45
+        RenderText {#text} at (0,0) size 168x45
+          text run at (0,0) width 160: ".one {height: 50px;}"
+          text run at (160,0) width 0: " "
+          text run at (0,15) width 168: ".two {height: 100px;}"
+          text run at (168,15) width 0: " "
+          text run at (0,30) width 0: " "
+      RenderBlock {HR} at (0,93) size 769x2 [border: (1px inset #000000)]
+      RenderBlock (anonymous) at (0,103) size 769x50
+        RenderImage {IMG} at (0,0) size 50x50
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,169) size 769x19
+        RenderText {#text} at (0,0) size 275x19
+          text run at (0,0) width 275: "The square above should be fifty pixels tall."
+      RenderBlock (anonymous) at (0,204) size 769x100
+        RenderImage {IMG} at (0,0) size 100x100
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,320) size 769x19
+        RenderText {#text} at (0,0) size 335x19
+          text run at (0,0) width 335: "The square above should be 100 pixels tall and wide."
+      RenderBlock (anonymous) at (0,355) size 769x100
+        RenderImage {IMG} at (0,0) size 30x100
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock {P} at (0,471) size 769x38
+        RenderText {#text} at (0,0) size 750x38
+          text run at (0,0) width 750: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size has"
+          text run at (0,19) width 150: "been doubled using the "
+        RenderInline {CODE} at (0,0) size 48x15
+          RenderText {#text} at (150,23) size 48x15
+            text run at (150,23) width 48: "height"
+        RenderText {#text} at (198,19) size 66x19
+          text run at (198,19) width 66: " property)."
+      RenderTable {TABLE} at (0,525) size 769x443 [border: (1px outset #808080)]
+        RenderTableSection {TBODY} at (1,1) size 767x441
+          RenderTableRow {TR} at (0,0) size 767x27
+            RenderTableCell {TD} at (0,0) size 767x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=2]
+              RenderInline {STRONG} at (0,0) size 163x19
+                RenderText {#text} at (4,4) size 163x19
+                  text run at (4,4) width 163: "TABLE Testing Section"
+          RenderTableRow {TR} at (0,27) size 767x414
+            RenderTableCell {TD} at (0,220) size 12x27 [bgcolor=#C0C0C0] [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1]
+              RenderText {#text} at (4,4) size 4x19
+                text run at (4,4) width 4: " "
+            RenderTableCell {TD} at (12,27) size 755x414 [border: (1px inset #808080)] [r=1 c=1 rs=1 cs=1]
+              RenderBlock (anonymous) at (4,4) size 747x50
+                RenderImage {IMG} at (0,0) size 50x50
+                RenderText {#text} at (0,0) size 0x0
+              RenderBlock {P} at (4,70) size 747x19
+                RenderText {#text} at (0,0) size 275x19
+                  text run at (0,0) width 275: "The square above should be fifty pixels tall."
+              RenderBlock (anonymous) at (4,105) size 747x100
+                RenderImage {IMG} at (0,0) size 100x100
+                RenderText {#text} at (0,0) size 0x0
+              RenderBlock {P} at (4,221) size 747x19
+                RenderText {#text} at (0,0) size 335x19
+                  text run at (0,0) width 335: "The square above should be 100 pixels tall and wide."
+              RenderBlock (anonymous) at (4,256) size 747x100
+                RenderImage {IMG} at (0,0) size 30x100
+                RenderText {#text} at (0,0) size 0x0
+              RenderBlock {P} at (4,372) size 747x38
+                RenderText {#text} at (0,0) size 725x38
+                  text run at (0,0) width 725: "The rectangular image above should be 100 pixels tall and 30 pixels wide (the original image is 50x15, and the size"
+                  text run at (0,19) width 175: "has been doubled using the "
+                RenderInline {CODE} at (0,0) size 48x15
+                  RenderText {#text} at (175,23) size 48x15
+                    text run at (175,23) width 48: "height"
+                RenderText {#text} at (223,19) size 66x19
+                  text run at (223,19) width 66: " property)."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d