X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=LayoutTests%2Fplatform%2Fefl%2Ffast%2Frepaint%2Fopacity-change-on-overflow-float-expected.txt;h=39d522efd7c46616db21df9b3a32969c51c23141;hb=b96e33af77ac7d81a666d5aa202235b793aeeb21;hp=4656c3a8853084937be99b44ddbe666cabb55d03;hpb=2632619e54bc9f41ccea7c574710fe213e49212d;p=framework%2Fweb%2Fwebkit-efl.git

diff --git a/LayoutTests/platform/efl/fast/repaint/opacity-change-on-overflow-float-expected.txt b/LayoutTests/platform/efl/fast/repaint/opacity-change-on-overflow-float-expected.txt
index 4656c3a..39d522e 100755
--- a/LayoutTests/platform/efl/fast/repaint/opacity-change-on-overflow-float-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/opacity-change-on-overflow-float-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 {P} at (0,0) size 784x28
         RenderText {#text} at (0,0) size 75x14
@@ -15,4 +16,20 @@ layer at (0,0) size 800x600
 layer at (8,48) size 100x100
   RenderBlock (floating) {DIV} at (0,40) size 100x100 [bgcolor=#FF0000]
 layer at (8,48) size 100x100
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x57
+        RenderText {#text} at (0,0) size 100x19
+          text run at (0,0) width 100: "Repaint test for "
+        RenderInline {RDAR} at (0,0) size 763x57
+          RenderText {#text} at (100,0) size 763x57
+            text run at (100,0) width 486: "REGRESSION (r41203): Facebook friend suggestions disappear on update. "
+            text run at (586,0) width 151: "Make sure when a layer"
+            text run at (0,19) width 689: "switches from being self-painting to non-self-painting that a layout happens to fix up the floating objects lists. "
+            text run at (689,19) width 74: "You should"
+            text run at (0,38) width 459: "see a 100x100 green square below. If you see any red, the test has failed."
+layer at (8,81) size 100x100
+  RenderBlock (floating) {DIV} at (0,73) size 100x100 [bgcolor=#FF0000]
+layer at (8,81) size 100x100
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (floating) {DIV} at (0,0) size 100x100 [bgcolor=#008000]