tizen beta release

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

diff --git a/LayoutTests/platform/efl/fast/repaint/transform-relative-position-expected.txt b/LayoutTests/platform/efl/fast/repaint/transform-relative-position-expected.txt
index 93f5422..c9bde2e 100755 (executable)
--- a/LayoutTests/platform/efl/fast/repaint/transform-relative-position-expected.txt
+++ b/LayoutTests/platform/efl/fast/repaint/transform-relative-position-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x248
   RenderBlock {HTML} at (0,0) size 800x248
     RenderBody {BODY} at (8,12) size 784x228
@@ -13,3 +14,18 @@ layer at (0,0) size 800x248
           text run at (270,0) width 218: ". The rotated box should be correctly redrawn."
 layer at (108,138) size 202x202
   RenderBlock (relative positioned) {DIV} at (0,26) size 202x202 [bgcolor=#CCCCCC] [border: (1px solid #000000)]
+=======
+layer at (0,0) size 800x261
+  RenderBlock {HTML} at (0,0) size 800x261
+    RenderBody {BODY} at (8,16) size 784x237
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 53x19
+          text run at (0,0) width 53: "Test for "
+        RenderInline {A} at (0,0) size 305x19 [color=#0000EE]
+          RenderText {#text} at (53,0) size 305x19
+            text run at (53,0) width 305: "https://bugs.webkit.org/show_bug.cgi?id=17840"
+        RenderText {#text} at (358,0) size 292x19
+          text run at (358,0) width 292: ". The rotated box should be correctly redrawn."
+layer at (108,151) size 202x202
+  RenderBlock (relative positioned) {DIV} at (0,35) size 202x202 [bgcolor=#CCCCCC] [border: (1px solid #000000)]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d