tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / transforms / transform-on-inline-expected.txt

diff --git a/LayoutTests/platform/efl/fast/transforms/transform-on-inline-expected.txt b/LayoutTests/platform/efl/fast/transforms/transform-on-inline-expected.txt
index 7ab709b..9f62d1c 100755 (executable)
--- a/LayoutTests/platform/efl/fast/transforms/transform-on-inline-expected.txt
+++ b/LayoutTests/platform/efl/fast/transforms/transform-on-inline-expected.txt
@@ -2,6 +2,7 @@ layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
+<<<<<<< HEAD
     RenderBody {BODY} at (8,8) size 784x580
       RenderBlock {P} at (0,0) size 784x14
         RenderText {#text} at (0,0) size 21x14
@@ -29,3 +30,32 @@ layer at (29,60) size 104x14
   RenderBlock {SPAN} at (21,0) size 104x14
     RenderText {#text} at (0,0) size 104x14
       text run at (0,0) width 104: "span in this paragraph"
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 29x19
+          text run at (0,0) width 29: "The "
+        RenderInline {SPAN} at (0,0) size 138x19
+          RenderText {#text} at (29,0) size 138x19
+            text run at (29,0) width 138: "span in this paragraph"
+        RenderText {#text} at (167,0) size 300x19
+          text run at (167,0) width 300: " has a transform, which has no effect on inlines."
+      RenderBlock {P} at (0,35) size 784x19
+        RenderText {#text} at (0,0) size 29x19
+          text run at (0,0) width 29: "The "
+        RenderText {#text} at (167,0) size 616x19
+          text run at (167,0) width 616: " has a transform, which has no effect on inlines. It also has opacity to throw it into a RenderLayer."
+      RenderBlock {P} at (0,70) size 784x19
+        RenderText {#text} at (0,0) size 29x19
+          text run at (0,0) width 29: "The "
+        RenderText {#text} at (167,0) size 542x19
+          text run at (167,0) width 542: " has a transform and opacity, and is an inline-block. So it should respect the transform."
+layer at (8,43) size 138x19
+  RenderInline {SPAN} at (0,0) size 138x19
+    RenderText {#text} at (29,0) size 138x19
+      text run at (29,0) width 138: "span in this paragraph"
+layer at (37,78) size 138x19
+  RenderBlock {SPAN} at (29,0) size 138x19
+    RenderText {#text} at (0,0) size 138x19
+      text run at (0,0) width 138: "span in this paragraph"
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d