tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / block / float / nopaint-after-layer-destruction2-expected.txt

diff --git a/LayoutTests/platform/efl/fast/block/float/nopaint-after-layer-destruction2-expected.txt b/LayoutTests/platform/efl/fast/block/float/nopaint-after-layer-destruction2-expected.txt
index 71d0846..c4c15d8 100755 (executable)
--- a/LayoutTests/platform/efl/fast/block/float/nopaint-after-layer-destruction2-expected.txt
+++ b/LayoutTests/platform/efl/fast/block/float/nopaint-after-layer-destruction2-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 784x14
         RenderText {#text} at (0,0) size 105x14
@@ -31,3 +32,36 @@ layer at (0,0) size 800x600
               text run at (81,14) width 676: "a strategic location for defending the former provincial capital of New Westminster in the case of an American naval invasion. Nevertheless, the"
               text run at (81,28) width 700: "federal government allowed logging operations there in the mid-nineteenth century. Large swathes of the park were also deforested by natural causes"
               text run at (81,42) width 176: "on two occasions in the 20th century."
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 139x19
+          text run at (0,0) width 139: "This is a pixel test for "
+        RenderInline {I} at (0,0) size 763x38
+          RenderInline {A} at (0,0) size 348x19 [color=#0000EE]
+            RenderText {#text} at (139,0) size 348x19
+              text run at (139,0) width 348: "http://bugzilla.opendarwin.org/show_bug.cgi?id=4334"
+          RenderText {#text} at (487,0) size 763x38
+            text run at (487,0) width 4: " "
+            text run at (491,0) width 272: "REGRESSION: Flickering when css-hover"
+            text run at (0,19) width 273: "should change opacity on floating elements"
+        RenderText {#text} at (273,19) size 4x19
+          text run at (273,19) width 4: "."
+      RenderBlock {P} at (0,54) size 784x19
+        RenderText {#text} at (0,0) size 491x19
+          text run at (0,0) width 491: "There should be a solid green square below mixed in with a paragraph of text."
+      RenderBlock {HR} at (0,89) size 784x2 [border: (1px inset #000000)]
+      RenderBlock {DIV} at (0,109) size 784x135
+        RenderBlock {DIV} at (0,0) size 784x135
+          RenderBlock (floating) {DIV} at (3,3) size 75x75 [bgcolor=#008000]
+          RenderBlock {H3} at (0,0) size 784x22
+            RenderText {#text} at (81,0) size 163x22
+              text run at (81,0) width 163: "Stanley Park Forest"
+          RenderBlock {P} at (0,40) size 784x95
+            RenderText {#text} at (81,0) size 784x95
+              text run at (81,0) width 703: "The forest is primarily second and third growth. The area was saved from development because of its status as a"
+              text run at (81,19) width 664: "federal military reserve; it occupied a strategic location for defending the former provincial capital of New"
+              text run at (81,38) width 693: "Westminster in the case of an American naval invasion. Nevertheless, the federal government allowed logging"
+              text run at (0,57) width 752: "operations there in the mid-nineteenth century. Large swathes of the park were also deforested by natural causes on two"
+              text run at (0,76) width 187: "occasions in the 20th century."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d