tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / layers / opacity-outline-expected.txt

diff --git a/LayoutTests/platform/efl/fast/layers/opacity-outline-expected.txt b/LayoutTests/platform/efl/fast/layers/opacity-outline-expected.txt
index 713b5d8..de09250 100755 (executable)
--- a/LayoutTests/platform/efl/fast/layers/opacity-outline-expected.txt
+++ b/LayoutTests/platform/efl/fast/layers/opacity-outline-expected.txt
@@ -3,6 +3,7 @@ layer at (0,0) size 800x600
 layer at (0,0) size 800x600
   RenderBlock {HTML} at (0,0) size 800x600
     RenderBody {BODY} at (8,8) size 784x584
+<<<<<<< HEAD
       RenderBlock {P} at (0,0) size 784x28
         RenderText {#text} at (0,0) size 40x14
           text run at (0,0) width 40: "Test for "
@@ -19,3 +20,21 @@ layer at (0,0) size 800x600
       RenderBlock {HR} at (0,40) size 784x2 [border: (1px inset #000000)]
 layer at (8,56) size 100x100
   RenderBlock {DIV} at (0,48) size 100x100 [bgcolor=#C0C0C0]
+=======
+      RenderBlock {P} at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 53x19
+          text run at (0,0) width 53: "Test for "
+        RenderInline {I} at (0,0) size 765x38
+          RenderInline {A} at (0,0) size 348x19 [color=#0000EE]
+            RenderText {#text} at (53,0) size 348x19
+              text run at (53,0) width 348: "http://bugzilla.opendarwin.org/show_bug.cgi?id=9193"
+          RenderText {#text} at (401,0) size 765x38
+            text run at (401,0) width 4: " "
+            text run at (405,0) width 360: "REGRESSION: setting an opacity on an element with an"
+            text run at (0,19) width 314: "outline causes the outline to disappear completely"
+        RenderText {#text} at (314,19) size 4x19
+          text run at (314,19) width 4: "."
+      RenderBlock {HR} at (0,54) size 784x2 [border: (1px inset #000000)]
+layer at (8,72) size 100x100
+  RenderBlock {DIV} at (0,64) size 100x100 [bgcolor=#C0C0C0]
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d