tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / css3 / selectors3 / html / css3-modsel-39c-expected.txt

diff --git a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-39c-expected.txt b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-39c-expected.txt
index b151aa5..6295534 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-39c-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-39c-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x164
   RenderBlock {HTML} at (0,0) size 800x164
     RenderBody {BODY} at (8,12) size 784x140
@@ -19,3 +20,27 @@ layer at (0,0) size 800x164
           text run at (0,98) width 777: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
           text run at (0,112) width 777: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
           text run at (0,126) width 257: "Dummy text. Dummy text. Dummy text. Dummy text."
+=======
+layer at (0,0) size 800x278
+  RenderBlock {HTML} at (0,0) size 800x278
+    RenderBody {BODY} at (8,16) size 784x246
+      RenderBlock {P} at (0,0) size 784x246
+        RenderInline (generated) at (0,0) size 20x19 [color=#FF0000]
+          RenderInline (generated) at (0,0) size 20x36 [color=#00FF00]
+            RenderText at (0,0) size 20x36
+              text run at (0,0) width 20: "T"
+          RenderText at (0,0) size 0x0
+        RenderText {#text} at (20,14) size 779x232
+          text run at (20,14) width 732: "his very long paragraph should have a big green first letter T. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,37) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,56) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,75) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,94) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,113) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,132) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,151) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,170) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,189) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,208) width 779: "Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text. Dummy text."
+          text run at (0,227) width 83: "Dummy text."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d