tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / backgrounds / quirks-mode-line-box-backgrounds-expected.txt

diff --git a/LayoutTests/platform/efl/fast/backgrounds/quirks-mode-line-box-backgrounds-expected.txt b/LayoutTests/platform/efl/fast/backgrounds/quirks-mode-line-box-backgrounds-expected.txt
index 77796cf..61e514f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/backgrounds/quirks-mode-line-box-backgrounds-expected.txt
+++ b/LayoutTests/platform/efl/fast/backgrounds/quirks-mode-line-box-backgrounds-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock (anonymous) at (0,0) size 784x14
         RenderText {#text} at (0,0) size 454x14
@@ -20,6 +21,26 @@ layer at (0,0) size 800x600
         RenderText {#text} at (0,0) size 310x14
           text run at (0,0) width 310: "The background below should be 10x10 and snugly fit the image:"
       RenderBlock {P} at (0,88) size 784x10
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 607x19
+          text run at (0,0) width 607: "The following two lines should be visible without the white background clipping any of the text:"
+      RenderBlock {P} at (0,35) size 784x30
+        RenderInline {SPAN} at (0,0) size 78x38 [bgcolor=#FFFFFF]
+          RenderText {#text} at (0,0) size 0x0
+          RenderInline {SPAN} at (0,0) size 78x30
+            RenderText {#text} at (0,0) size 78x15
+              text run at (0,0) width 78: "FOOBARBAZ"
+            RenderBR {BR} at (78,12) size 0x0
+            RenderText {#text} at (0,15) size 78x15
+              text run at (0,15) width 78: "BAZBARFOO"
+        RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,81) size 784x19
+        RenderText {#text} at (0,0) size 415x19
+          text run at (0,0) width 415: "The background below should be 10x10 and snugly fit the image:"
+      RenderBlock {P} at (0,116) size 784x10
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {SPAN} at (0,0) size 10x45 [bgcolor=#FF0000]
           RenderImage {IMG} at (0,0) size 10x10
         RenderText {#text} at (0,0) size 0x0