tizen beta release

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

diff --git a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-7-expected.txt b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-7-expected.txt
index 6e47c62..c1f2a82 100755 (executable)
--- a/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-7-expected.txt
+++ b/LayoutTests/platform/efl/css3/selectors3/html/css3-modsel-7-expected.txt
@@ -1,5 +1,6 @@
 layer at (0,0) size 800x600
   RenderView at (0,0) size 800x600
+<<<<<<< HEAD
 layer at (0,0) size 800x60
   RenderBlock {HTML} at (0,0) size 800x60
     RenderBody {BODY} at (8,12) size 784x40
@@ -17,4 +18,23 @@ layer at (0,0) size 800x60
           RenderText {#text} at (123,0) size 449x14
             text run at (123,0) width 262: "have green background because the selector in the last "
             text run at (385,0) width 187: "rule does not apply to the inner SPANs."
+=======
+layer at (0,0) size 800x78
+  RenderBlock {HTML} at (0,0) size 800x78
+    RenderBody {BODY} at (8,16) size 784x54
+      RenderBlock {P} at (0,0) size 784x19 [bgcolor=#00FF00]
+        RenderText {#text} at (0,0) size 484x19
+          text run at (0,0) width 406: "This paragraph should have green background because CLASS "
+          text run at (406,0) width 78: "contains \"b\""
+      RenderBlock {ADDRESS} at (0,35) size 784x19 [bgcolor=#00FF00]
+        RenderInline {SPAN} at (0,0) size 156x19
+          RenderText {#text} at (0,0) size 156x19
+            text run at (0,0) width 156: "This address should also"
+        RenderText {#text} at (156,0) size 4x19
+          text run at (156,0) width 4: " "
+        RenderInline {SPAN} at (0,0) size 600x19
+          RenderText {#text} at (160,0) size 600x19
+            text run at (160,0) width 350: "have green background because the selector in the last "
+            text run at (510,0) width 250: "rule does not apply to the inner SPANs."
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderText {#text} at (0,0) size 0x0