tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / css / invalidation-errors-expected.txt

diff --git a/LayoutTests/platform/efl/fast/css/invalidation-errors-expected.txt b/LayoutTests/platform/efl/fast/css/invalidation-errors-expected.txt
index bc11a85..eeda04f 100755 (executable)
--- a/LayoutTests/platform/efl/fast/css/invalidation-errors-expected.txt
+++ b/LayoutTests/platform/efl/fast/css/invalidation-errors-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
         RenderInline {A} at (0,0) size 45x14 [color=#0000EE]
@@ -14,6 +15,20 @@ layer at (0,0) size 800x600
           RenderText {#text} at (0,0) size 0x0
         RenderText {#text} at (0,0) size 0x0
 layer at (8,34) size 200x200
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock {P} at (0,0) size 784x19
+        RenderInline {A} at (0,0) size 60x19 [color=#0000EE]
+          RenderText {#text} at (0,0) size 60x19
+            text run at (0,0) width 60: "bug 7118"
+        RenderText {#text} at (60,0) size 356x19
+          text run at (60,0) width 356: ": Wrong property values do not get invalidated correctly."
+      RenderBlock (anonymous) at (0,35) size 784x0
+        RenderInline {DIV} at (0,0) size 0x0
+          RenderText {#text} at (0,0) size 0x0
+        RenderText {#text} at (0,0) size 0x0
+layer at (8,43) size 200x200
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (floating) {DIV} at (0,0) size 200x200 [color=#FFFFFF] [bgcolor=#006400]
     RenderText {#text} at (0,0) size 194x128
       text run at (0,0) width 160: "this text should be left-"