tizen beta release

[profile/ivi/webkit-efl.git] / LayoutTests / platform / efl / fast / block / positioning / relayout-on-position-change-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/positioning/relayout-on-position-change-expected.txt b/LayoutTests/platform/efl/fast/block/positioning/relayout-on-position-change-expected.txt
index 760c6d1..71b46c1 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/positioning/relayout-on-position-change-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/positioning/relayout-on-position-change-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 {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 161x14
           text run at (0,0) width 161: "This tests for a regression against "
@@ -21,4 +22,25 @@ layer at (0,0) size 800x600
       RenderBlock {HR} at (0,52) size 784x2 [border: (1px inset #000000)]
 layer at (8,68) size 200x100
   RenderBlock (relative positioned) {DIV} at (0,60) size 200x100 [bgcolor=#FFFF00]
+=======
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 212x19
+          text run at (0,0) width 212: "This tests for a regression against "
+        RenderInline {I} at (0,0) size 756x38
+          RenderInline {A} at (0,0) size 348x19 [color=#0000EE]
+            RenderText {#text} at (212,0) size 348x19
+              text run at (212,0) width 348: "http://bugzilla.opendarwin.org/show_bug.cgi?id=7095"
+          RenderText {#text} at (560,0) size 756x38
+            text run at (560,0) width 4: " "
+            text run at (564,0) width 192: "Removing positioning from an"
+            text run at (0,19) width 220: "element does not relayout properly"
+        RenderText {#text} at (220,19) size 4x19
+          text run at (220,19) width 4: "."
+      RenderBlock {P} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 373x19
+          text run at (0,0) width 373: "The green square should be to the left of the yellow square."
+      RenderBlock {HR} at (0,89) size 784x2 [border: (1px inset #000000)]
+layer at (8,107) size 200x100
+  RenderBlock (relative positioned) {DIV} at (0,99) size 200x100 [bgcolor=#FFFF00]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
     RenderBlock {DIV} at (0,0) size 100x100 [bgcolor=#008000]