tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/repaint/overflow-outline-repaint-expected.txt b/LayoutTests/platform/efl/fast/repaint/overflow-outline-repaint-expected.txt
index 89ca0e3..49f0ab0 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/overflow-outline-repaint-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/overflow-outline-repaint-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 (anonymous) at (0,0) size 784x28
         RenderText {#text} at (0,0) size 762x28
           text run at (0,0) width 435: "If the red outline at the bottom of the div extends all the way to the scrollbar, the test passes. "
@@ -22,4 +23,26 @@ layer at (8,36) size 80x69 scrollY 71 scrollHeight 140
     RenderInline {SPAN} at (0,0) size 70x14
       RenderText {#text} at (0,126) size 70x14
         text run at (0,126) width 70: "Excellent! Test"
+=======
+      RenderBlock (anonymous) at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 781x38
+          text run at (0,0) width 580: "If the red outline at the bottom of the div extends all the way to the scrollbar, the test passes. "
+          text run at (580,0) width 201: "If it stops short, then the test has"
+          text run at (0,19) width 293: "failed, and an incomplete repaint has occurred."
+layer at (8,46) size 80x69 clip at (8,46) size 65x69 scrollY 91 scrollHeight 209
+  RenderBlock {DIV} at (0,38) size 80x69
+    RenderBR {BR} at (0,0) size 0x19
+    RenderBR {BR} at (0,19) size 0x19
+    RenderBR {BR} at (0,38) size 0x19
+    RenderBR {BR} at (0,57) size 0x19
+    RenderBR {BR} at (0,76) size 0x19
+    RenderBR {BR} at (0,95) size 0x19
+    RenderBR {BR} at (0,114) size 0x19
+    RenderBR {BR} at (0,133) size 0x19
+    RenderBR {BR} at (0,152) size 0x19
+    RenderInline {SPAN} at (0,0) size 64x38
+      RenderText {#text} at (0,171) size 64x38
+        text run at (0,171) width 64: "Excellent!"
+        text run at (0,190) width 27: "Test"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
     RenderText {#text} at (0,0) size 0x0