tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / fast / dom / HTMLImageElement / image-alt-text-expected.txt

diff --git a/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt b/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt
index 44e0a59..6c596af 100755 (executable)
--- a/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-expected.txt
+++ b/LayoutTests/platform/efl/fast/dom/HTMLImageElement/image-alt-text-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 (anonymous) at (0,0) size 784x14
         RenderText {#text} at (0,0) size 656x14
@@ -13,3 +14,17 @@ layer at (0,0) size 800x600
         RenderBR {BR} at (102,66) size 0x0
         RenderImage {IMG} at (0,66) size 75x25
         RenderBR {BR} at (75,91) size 0x0
+=======
+    RenderBody {BODY} at (8,8) size 784x576
+      RenderBlock (anonymous) at (0,0) size 784x38
+        RenderText {#text} at (0,0) size 779x38
+          text run at (0,0) width 779: "This tests whether alt text is shown for image elements with no src attribute. You should see \"Success\" twice, followed by a"
+          text run at (0,19) width 92: "blue rectangle."
+      RenderBlock {P} at (0,54) size 784x96
+        RenderImage {IMG} at (0,0) size 50x19
+        RenderBR {BR} at (50,19) size 0x0
+        RenderImage {IMG} at (0,19) size 102x52 [border: (1px solid #000000)]
+        RenderBR {BR} at (102,71) size 0x0
+        RenderImage {IMG} at (0,71) size 75x25
+        RenderBR {BR} at (75,96) size 0x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d