tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/repaint/clipped-relative-expected.txt b/LayoutTests/platform/efl/fast/repaint/clipped-relative-expected.txt
index 97fd017..6129a21 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/clipped-relative-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/clipped-relative-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 114x14
           text run at (0,0) width 114: "This is a repaint test for "
@@ -19,6 +20,25 @@ layer at (0,0) size 800x600
 layer at (8,42) size 214x232 scrollWidth 644
   RenderBlock (relative positioned) {DIV} at (0,34) size 214x232
 layer at (-2,42) size 214x232 backgroundClip at (8,42) size 214x232 clip at (8,42) size 214x232 outlineClip at (8,42) size 214x232
+=======
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 151x19
+          text run at (0,0) width 151: "This is a repaint test for "
+        RenderInline {I} at (0,0) size 749x38
+          RenderInline {A} at (0,0) size 348x19 [color=#0000EE]
+            RenderText {#text} at (151,0) size 348x19
+              text run at (151,0) width 348: "http://bugzilla.opendarwin.org/show_bug.cgi?id=9121"
+          RenderText {#text} at (499,0) size 749x38
+            text run at (499,0) width 4: " "
+            text run at (503,0) width 246: "REGRESSION: [Incremental Repaint]"
+            text run at (0,19) width 200: "DHTML movement test failures"
+        RenderText {#text} at (200,19) size 4x19
+          text run at (200,19) width 4: "."
+      RenderBlock {HR} at (0,54) size 784x2 [border: (1px inset #000000)]
+layer at (8,72) size 214x232 scrollWidth 644
+  RenderBlock (relative positioned) {DIV} at (0,64) size 214x232
+layer at (-2,72) size 214x232 backgroundClip at (8,72) size 214x232 clip at (8,72) size 214x232 outlineClip at (8,72) size 214x232
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (positioned) {DIV} at (-440,0) size 214x232
     RenderImage {IMG} at (0,0) size 214x232
     RenderText {#text} at (0,0) size 0x0