tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / repaint / layer-outline-expected.txt

diff --git a/LayoutTests/platform/efl/fast/repaint/layer-outline-expected.txt b/LayoutTests/platform/efl/fast/repaint/layer-outline-expected.txt
index 433e3ef..04997bb 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/layer-outline-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/layer-outline-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 158x14
           text run at (0,0) width 158: "This tests for regressions against "
@@ -29,3 +30,31 @@ layer at (538,52) size 100x100 backgroundClip at (548,62) size 90x90 clip at (54
   RenderBlock (positioned) {DIV} at (530,10) size 100x100 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
 layer at (18,312) size 100x100
   RenderBlock (relative positioned) {DIV} at (0,284) size 100x100 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 207x19
+          text run at (0,0) width 207: "This tests for regressions against "
+        RenderInline {I} at (0,0) size 542x19
+          RenderInline {A} at (0,0) size 348x19 [color=#0000EE]
+            RenderText {#text} at (207,0) size 348x19
+              text run at (207,0) width 348: "http://bugzilla.opendarwin.org/show_bug.cgi?id=7943"
+          RenderText {#text} at (555,0) size 194x19
+            text run at (555,0) width 194: " Layer outline does not repaint"
+        RenderText {#text} at (749,0) size 4x19
+          text run at (749,0) width 4: "."
+      RenderBlock {HR} at (0,35) size 784x2 [border: (1px inset #000000)]
+layer at (18,193) size 100x100 clip at (19,194) size 98x98
+  RenderBlock {DIV} at (10,185) size 100x100 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
+layer at (8,53) size 784x130
+  RenderBlock (relative positioned) {DIV} at (0,45) size 784x130
+layer at (18,63) size 100x100
+  RenderBlock (positioned) {DIV} at (10,10) size 100x100 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
+layer at (148,63) size 100x100 backgroundClip at (148,63) size 90x90 clip at (138,53) size 100x100 outlineClip at (138,53) size 100x100
+  RenderBlock (positioned) {DIV} at (140,10) size 100x100 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
+layer at (408,63) size 100x100
+  RenderBlock (positioned) {DIV} at (400,10) size 100x100 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
+layer at (538,63) size 100x100 backgroundClip at (548,73) size 90x90 clip at (548,73) size 100x100 outlineClip at (548,73) size 100x100
+  RenderBlock (positioned) {DIV} at (530,10) size 100x100 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
+layer at (18,323) size 100x100
+  RenderBlock (relative positioned) {DIV} at (0,295) size 100x100 [bgcolor=#EEEEEE] [border: (1px solid #000000)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d