tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / media / audio-repaint-expected.txt

diff --git a/LayoutTests/platform/efl/media/audio-repaint-expected.txt b/LayoutTests/platform/efl/media/audio-repaint-expected.txt
index e2284f4..f5c09d2 100755 (executable)
--- a/LayoutTests/platform/efl/media/audio-repaint-expected.txt
+++ b/LayoutTests/platform/efl/media/audio-repaint-expected.txt
@@ -3,27 +3,47 @@ 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 784x14
         RenderText {#text} at (0,0) size 521x14
           text run at (0,0) width 454: "This tests that in a html document with inline audio content, the media element repaints correctly "
           text run at (454,0) width 67: "while playing."
       RenderBlock (anonymous) at (0,26) size 784x139
+=======
+      RenderBlock {P} at (0,0) size 784x19
+        RenderText {#text} at (0,0) size 699x19
+          text run at (0,0) width 609: "This tests that in a html document with inline audio content, the media element repaints correctly "
+          text run at (609,0) width 90: "while playing."
+      RenderBlock (anonymous) at (0,35) size 784x139
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderMedia {AUDIO} at (0,0) size 300x20
         RenderBR {BR} at (300,20) size 0x0
         RenderBR {BR} at (300,65) size 0x0
         RenderBR {BR} at (300,139) size 0x0
+<<<<<<< HEAD
 layer at (8,54) size 300x20
   RenderMedia {AUDIO} at (0,20) size 300x20
 layer at (8,54) size 300x20
   RenderBlock (relative positioned) {DIV} at (0,0) size 300x20
 layer at (8,54) size 300x20 scrollHeight 28
+=======
+layer at (8,63) size 300x20
+  RenderMedia {AUDIO} at (0,20) size 300x20
+layer at (8,63) size 300x20
+  RenderBlock (relative positioned) {DIV} at (0,0) size 300x20
+layer at (8,63) size 300x20 scrollHeight 28
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
       RenderBlock (anonymous) at (0,0) size 63x28
         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
           RenderBlock (anonymous) at (4,4) size 55x20
+<<<<<<< HEAD
             RenderText {#text} at (0,0) size 55x11
+=======
+            RenderText {#text} at (0,0) size 55x12
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
               text run at (0,0) width 55: "00:00 / 00:01"
       RenderSlider {INPUT} at (63,0) size 157x20
         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x20
@@ -32,18 +52,30 @@ layer at (8,54) size 300x20 scrollHeight 28
     RenderButton {INPUT} at (240,0) size 20x20
     RenderButton {INPUT} at (260,0) size 20x20
     RenderButton {INPUT} at (280,0) size 20x20
+<<<<<<< HEAD
 layer at (177,58) size 12x12
   RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
 layer at (8,34) size 300x20
   RenderBlock (relative positioned) {DIV} at (0,0) size 300x20
 layer at (8,34) size 300x20 scrollHeight 28
+=======
+layer at (162,67) size 12x12
+  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
+layer at (8,43) size 300x20
+  RenderBlock (relative positioned) {DIV} at (0,0) size 300x20
+layer at (8,43) size 300x20 scrollHeight 28
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
       RenderBlock (anonymous) at (0,0) size 63x28
         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
           RenderBlock (anonymous) at (4,4) size 55x20
+<<<<<<< HEAD
             RenderText {#text} at (0,0) size 55x11
+=======
+            RenderText {#text} at (0,0) size 55x12
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
               text run at (0,0) width 55: "00:00 / 00:01"
       RenderSlider {INPUT} at (63,0) size 157x20
         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x20
@@ -52,6 +84,7 @@ layer at (8,34) size 300x20 scrollHeight 28
     RenderButton {INPUT} at (240,0) size 20x20
     RenderButton {INPUT} at (260,0) size 20x20
     RenderButton {INPUT} at (280,0) size 20x20
+<<<<<<< HEAD
 layer at (177,38) size 12x12
   RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
 layer at (8,126) size 300x20
@@ -59,13 +92,26 @@ layer at (8,126) size 300x20
 layer at (8,126) size 300x20
   RenderBlock (relative positioned) {DIV} at (0,0) size 300x20
 layer at (8,126) size 300x20 scrollHeight 28
+=======
+layer at (162,47) size 12x12
+  RenderBlock (relative positioned) {DIV} at (0,0) size 12x12
+layer at (8,135) size 300x20
+  RenderMedia {AUDIO} at (0,92) size 300x20
+layer at (8,135) size 300x20
+  RenderBlock (relative positioned) {DIV} at (0,0) size 300x20
+layer at (8,135) size 300x20 scrollHeight 28
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderDeprecatedFlexibleBox (positioned) {DIV} at (0,0) size 300x20
     RenderButton {INPUT} at (0,0) size 20x20
     RenderDeprecatedFlexibleBox {DIV} at (20,0) size 220x20
       RenderBlock (anonymous) at (0,0) size 63x28
         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 63x28
           RenderBlock (anonymous) at (4,4) size 55x20
+<<<<<<< HEAD
             RenderText {#text} at (0,0) size 55x11
+=======
+            RenderText {#text} at (0,0) size 55x12
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
               text run at (0,0) width 55: "00:00 / 00:01"
       RenderSlider {INPUT} at (63,0) size 157x20
         RenderDeprecatedFlexibleBox {DIV} at (0,0) size 157x20
@@ -74,5 +120,9 @@ layer at (8,126) size 300x20 scrollHeight 28
     RenderButton {INPUT} at (240,0) size 20x20
     RenderButton {INPUT} at (260,0) size 20x20
     RenderButton {INPUT} at (280,0) size 20x20
+<<<<<<< HEAD
 layer at (177,130) size 12x12
+=======
+layer at (162,139) size 12x12
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
   RenderBlock (relative positioned) {DIV} at (0,0) size 12x12