tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/repaint/border-radius-repaint-expected.txt b/LayoutTests/platform/efl/fast/repaint/border-radius-repaint-expected.txt
index 5d1c5c5..cc719b3 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/border-radius-repaint-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/border-radius-repaint-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x344
   RenderBlock {HTML} at (0,0) size 800x344
     RenderBody {BODY} at (8,12) size 784x324
@@ -21,5 +22,29 @@ layer at (0,0) size 800x344
       RenderBlock (anonymous) at (0,168) size 784x14
         RenderBR {BR} at (0,0) size 0x14
       RenderBlock {DIV} at (0,182) size 222x142 [border: (1px solid #0000FF)]
+=======
+layer at (0,0) size 800x381
+  RenderBlock {HTML} at (0,0) size 800x381
+    RenderBody {BODY} at (8,16) size 784x357
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 100x19
+          text run at (0,0) width 100: "Repaint test for "
+        RenderInline {I} at (0,0) size 777x38
+          RenderInline {A} at (0,0) size 301x19 [color=#0000EE]
+            RenderText {#text} at (100,0) size 301x19
+              text run at (100,0) width 301: "http://bugs.webkit.org/show_bug.cgi?id=10699"
+          RenderText {#text} at (401,0) size 777x38
+            text run at (401,0) width 4: " "
+            text run at (405,0) width 372: "div with border-radius does not redraw properly if element"
+            text run at (0,19) width 122: "inside div is resized"
+        RenderText {#text} at (122,19) size 4x19
+          text run at (122,19) width 4: "."
+      RenderBlock {DIV} at (0,54) size 222x142 [border: (1px solid #0000FF)]
+        RenderBlock {DIV} at (11,11) size 200x68 [bgcolor=#008080] [border: (4px solid #FF0000)]
+          RenderBlock {DIV} at (14,14) size 172x40 [bgcolor=#C0C0C0]
+      RenderBlock (anonymous) at (0,196) size 784x19
+        RenderBR {BR} at (0,0) size 0x19
+      RenderBlock {DIV} at (0,215) size 222x142 [border: (1px solid #0000FF)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderBlock {DIV} at (11,11) size 200x88 [bgcolor=#008080] [border: (4px solid #FF0000)]
           RenderBlock {DIV} at (14,14) size 172x60 [bgcolor=#C0C0C0]