Fix frames layout tests now that regression has been fixed.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@6434 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/fast/flexbox/016-expected.txt b/LayoutTests/fast/flexbox/016-expected.txt
index 2d680f4cc742bde490a42f7288bcdcab350780bd..823a64930b55db48e1e65a9bae4cc66a7c5494c2 100644 (file)
--- a/LayoutTests/fast/flexbox/016-expected.txt
+++ b/LayoutTests/fast/flexbox/016-expected.txt
@@ -13,6 +13,8 @@ layer at (0,0) size 812x585
             text run at (254,18) width 499: "It should start beneath the header, end above the footer, and fill the width of the"
             text run at (0,36) width 111: "browser window."
         RenderPartObject {IFRAME} at (0,54) size 812x513 [bgcolor=#008000] [border: (10px solid #808000)]
+          layer at (0,0) size 777x493
+            RenderCanvas at (0,0) size 777x493
         RenderBlock {DIV} at (0,567) size 800x18
           RenderText {TEXT} at (0,0) size 664x18
             text run at (0,0) width 407: "This footer should remain at the bottom of the browser window. "

diff --git a/LayoutTests/fast/frames/001-expected.txt b/LayoutTests/fast/frames/001-expected.txt
index 6d7af0c7bc9279a53107da7edb75c0db9833ae19..d48eaba0dedfe0a45e77fefa0a5ceed9abde4d96 100644 (file)
--- a/LayoutTests/fast/frames/001-expected.txt
+++ b/LayoutTests/fast/frames/001-expected.txt
@@ -8,10 +8,16 @@ layer at (0,0) size 800x208
       RenderBR {BR} at (0,0) size 0x0
       RenderText {TEXT} at (0,0) size 0x0
       RenderPartObject {IFRAME} at (0,18) size 170x170 [border: (10px solid #FF0000)]
+        layer at (0,0) size 85x100
+          RenderCanvas at (0,0) size 85x100
       RenderText {TEXT} at (170,174) size 4x18
         text run at (170,174) width 4: " "
       RenderPartObject {OBJECT} at (174,18) size 170x170 [border: (10px solid #FF0000)]
+        layer at (0,0) size 85x100
+          RenderCanvas at (0,0) size 85x100
       RenderText {TEXT} at (344,174) size 4x18
         text run at (344,174) width 4: " "
       RenderPartObject {OBJECT} at (348,18) size 170x170 [border: (10px solid #FF0000)]
+        layer at (0,0) size 85x100
+          RenderCanvas at (0,0) size 85x100
       RenderText {TEXT} at (0,0) size 0x0

diff --git a/LayoutTests/fast/frames/empty-frame-src-expected.txt b/LayoutTests/fast/frames/empty-frame-src-expected.txt
index 09cadd5b7581739ad7cd25ffacaa7d081cb4d04e..46ca280e8eb477e1c0d179444b22d73b061c28c7 100644 (file)
--- a/LayoutTests/fast/frames/empty-frame-src-expected.txt
+++ b/LayoutTests/fast/frames/empty-frame-src-expected.txt
@@ -16,3 +16,5 @@ layer at (0,0) size 800x600
           RenderBlock {HTML} at (0,0) size 783x8
             RenderBody {BODY} at (8,8) size 767x0 [bgcolor=#800080]
       RenderFrame {FRAME} at (0,402) size 800x197
+        layer at (0,0) size 783x193
+          RenderCanvas at (0,0) size 783x193