tizen beta release

[framework/web/webkit-efl.git] / LayoutTests / platform / efl / tables / mozilla / bugs / bug3037-1-expected.txt

diff --git a/LayoutTests/platform/efl/tables/mozilla/bugs/bug3037-1-expected.txt b/LayoutTests/platform/efl/tables/mozilla/bugs/bug3037-1-expected.txt
index b404022..d29e13d 100755 (executable)
--- a/LayoutTests/platform/efl/tables/mozilla/bugs/bug3037-1-expected.txt
+++ b/LayoutTests/platform/efl/tables/mozilla/bugs/bug3037-1-expected.txt
@@ -14,6 +14,7 @@ layer at (0,0) size 800x600
                 RenderText {#text} at (0,0) size 0x0
                 RenderInline {XUL:TOOLBAR} at (0,0) size 0x0
                   RenderText {#text} at (0,0) size 0x0
+<<<<<<< HEAD
       RenderBlock (anonymous) at (0,0) size 784x14
         RenderTable at (0,0) size 25x14
           RenderTableSection (anonymous) at (0,0) size 25x14
@@ -30,6 +31,24 @@ layer at (0,0) size 800x600
                 RenderInline {HTML:INPUT} at (0,0) size 0x0
                 RenderText {#text} at (0,0) size 0x0
       RenderBlock (anonymous) at (0,14) size 784x0
+=======
+      RenderBlock (anonymous) at (0,0) size 784x19
+        RenderTable at (0,0) size 34x19
+          RenderTableSection (anonymous) at (0,0) size 34x19
+            RenderTableRow (anonymous) at (0,0) size 34x19
+              RenderTableCell {HTML:SPAN} at (0,0) size 33x19 [r=0 c=0 rs=1 cs=1]
+                RenderInline {HTML:BUTTON} at (0,0) size 33x19 [bgcolor=#C0C0C0]
+                  RenderText {#text} at (0,0) size 0x0
+                  RenderInline {HTML:IMG} at (0,0) size 33x19
+                    RenderInline {HTML:BR} at (0,0) size 33x19
+                      RenderText {#text} at (0,0) size 33x19
+                        text run at (0,0) width 33: "Back"
+                RenderText {#text} at (0,0) size 0x0
+              RenderTableCell {HTML:SPAN} at (33,0) size 1x0 [r=0 c=1 rs=1 cs=1]
+                RenderInline {HTML:INPUT} at (0,0) size 0x0
+                RenderText {#text} at (0,0) size 0x0
+      RenderBlock (anonymous) at (0,19) size 784x0
+>>>>>>> 6448a48e03586d4121fcff9ca92e9ee862e1d77d
         RenderInline {WINDOW} at (0,0) size 0x0
           RenderInline {WINDOW} at (0,0) size 0x0
             RenderInline {WINDOW} at (0,0) size 0x0