diff options
18 files changed, 23 insertions, 39 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/invalid/residual-style-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/invalid/residual-style-expected.txt index 8445c21..454972f 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/invalid/residual-style-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/invalid/residual-style-expected.txt @@ -292,7 +292,7 @@ layer at (0,0) size 785x3611 RenderBlock (anonymous) at (0,1143) size 769x20 RenderText {#text} at (0,0) size 60x19 text run at (0,0) width 60: "EMBED: " - RenderPartObject {EMBED} at (60,15) size 0x0 + RenderEmbeddedObject {EMBED} at (60,15) size 0x0 RenderInline {FONT} at (0,0) size 160x19 [color=#008000] RenderText {#text} at (60,0) size 160x19 text run at (60,0) width 160: "All of this should be green." diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/replaced-breaking-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/replaced-breaking-expected.txt index 89ea70b..f4db4aa 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/replaced-breaking-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/replaced-breaking-expected.txt @@ -59,8 +59,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 25x25 RenderBody {BODY} at (8,8) size 9x9 RenderText {#text} at (0,0) size 0x0 - RenderPartObject {EMBED} at (1,525) size 27x27 [border: (1px solid #000000)] - RenderPartObject {EMBED} at (1,552) size 27x27 [border: (1px solid #000000)] + RenderEmbeddedObject {EMBED} at (1,525) size 27x27 [border: (1px solid #000000)] + RenderEmbeddedObject {EMBED} at (1,552) size 27x27 [border: (1px solid #000000)] RenderText {#text} at (0,0) size 0x0 layer at (13,14) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum index 148a69c..e665730 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.checksum @@ -1 +1 @@ -4e3574a44d7dbd1d2fbdf3dae9b798ff
\ No newline at end of file +698a2e6648aeb67111a5305dcc935c35
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png Binary files differindex 7b7d918..f322322 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/pasting-object-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/pasting-object-expected.txt index a62921a..c035b88 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/pasting-object-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/editing/pasteboard/pasting-object-expected.txt @@ -18,7 +18,7 @@ layer at (0,0) size 800x600 RenderBlock {DIV} at (0,56) size 784x157 RenderText {#text} at (0,137) size 32x19 text run at (0,137) width 32: "Hello" - RenderPartObject {OBJECT} at (32,0) size 302x152 [border: (1px solid #AAAAAA)] + RenderEmbeddedObject {OBJECT} at (32,0) size 302x152 [border: (1px solid #AAAAAA)] RenderText {#text} at (334,137) size 48x19 text run at (334,137) width 48: " World!" caret: position 1 of child 1 {OBJECT} of child 3 {DIV} of child 1 {BODY} of child 0 {HTML} of document diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/basic/013-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/basic/013-expected.txt index a42ca4b..8e4bd4d 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/basic/013-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/block/basic/013-expected.txt @@ -17,7 +17,7 @@ layer at (0,0) size 800x600 text run at (0,0) width 138: "This text is underneath." RenderText {#text} at (504,89) size 4x19 text run at (504,89) width 4: " " - RenderPartObject {OBJECT} at (0,109) size 500x100 + RenderEmbeddedObject {OBJECT} at (0,109) size 500x100 layer at (0,0) size 500x100 RenderView at (0,0) size 500x100 layer at (0,0) size 500x100 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/vspace-hspace-as-number-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/vspace-hspace-as-number-expected.txt index 58b1fa1..c0d1056 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/vspace-hspace-as-number-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/HTMLObjectElement/vspace-hspace-as-number-expected.txt @@ -8,7 +8,7 @@ layer at (0,0) size 800x600 text run at (0,0) width 752: "This test makes sure that HTMLObjectElement.vspace and HTMLObjectElement.hspace are exposed as numbers instead of" text run at (0,20) width 688: "strings, per the DOM Level 2 HTML spec: http://www.w3.org/TR/DOM-Level-2-HTML/html.html#ID-9893177" RenderBlock (anonymous) at (0,56) size 784x170 - RenderPartObject {OBJECT} at (20,10) size 300x150 + RenderEmbeddedObject {OBJECT} at (20,10) size 300x150 RenderText {#text} at (0,0) size 0x0 RenderBlock {DIV} at (0,226) size 784x20 RenderText {#text} at (0,0) size 74x19 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/flash-replacement-test-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/flash-replacement-test-expected.txt index a379462..4b1c95e 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/flash-replacement-test-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dynamic/flash-replacement-test-expected.txt @@ -4,7 +4,7 @@ layer at (0,0) size 800x274 RenderBlock {HTML} at (0,0) size 800x274 RenderBody {BODY} at (8,8) size 784x258 RenderBlock (anonymous) at (0,0) size 784x159 - RenderPartObject {OBJECT} at (0,0) size 249x154 + RenderEmbeddedObject {OBJECT} at (0,0) size 249x154 RenderText {#text} at (249,139) size 4x19 text run at (249,139) width 4: " " RenderBR {BR} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/001-expected.txt index 683918b..c33442a 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/001-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/frames/001-expected.txt @@ -14,7 +14,7 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 84x84 RenderText {#text} at (170,175) size 4x19 text run at (170,175) width 4: " " - RenderPartObject {OBJECT} at (174,20) size 170x170 [border: (10px solid #FF0000)] + RenderEmbeddedObject {OBJECT} at (174,20) size 170x170 [border: (10px solid #FF0000)] layer at (0,0) size 100x100 RenderView at (0,0) size 100x100 layer at (0,0) size 100x100 @@ -22,7 +22,7 @@ layer at (0,0) size 800x600 RenderBody {BODY} at (8,8) size 84x84 RenderText {#text} at (344,175) size 4x19 text run at (344,175) width 4: " " - RenderPartObject {OBJECT} at (348,20) size 170x170 [border: (10px solid #FF0000)] + RenderEmbeddedObject {OBJECT} at (348,20) size 170x170 [border: (10px solid #FF0000)] layer at (0,0) size 100x100 RenderView at (0,0) size 100x100 layer at (0,0) size 100x100 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/invalid/residual-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/invalid/residual-style-expected.txt index e09b721..c0bcf30 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/invalid/residual-style-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/invalid/residual-style-expected.txt @@ -292,7 +292,7 @@ layer at (0,0) size 785x3617 RenderBlock (anonymous) at (0,1143) size 769x20 RenderText {#text} at (0,0) size 60x19 text run at (0,0) width 60: "EMBED: " - RenderPartObject {EMBED} at (60,15) size 0x0 + RenderEmbeddedObject {EMBED} at (60,15) size 0x0 RenderInline {FONT} at (0,0) size 160x19 [color=#008000] RenderText {#text} at (60,0) size 160x19 text run at (60,0) width 160: "All of this should be green." diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/001-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/001-expected.txt index f11b7ae..1be63da 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/001-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/parser/001-expected.txt @@ -22,7 +22,7 @@ layer at (0,0) size 800x600 RenderText {#text} at (0,0) size 64x16 text run at (0,0) width 64: "Pre text" text run at (64,0) width 0: " " - RenderPartObject {OBJECT} at (0,16) size 300x300 [bgcolor=#008000] + RenderEmbeddedObject {OBJECT} at (0,16) size 300x300 [bgcolor=#008000] RenderText {#text} at (300,304) size 300x32 text run at (300,304) width 0: " " text run at (0,320) width 104: "Also pre text" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/007-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/007-expected.txt index 4358812..321a36b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/007-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/007-expected.txt @@ -15,7 +15,7 @@ layer at (0,0) size 800x600 RenderBR {BR} at (619,154) size 0x0 RenderText {#text} at (166,294) size 151x19 text run at (166,294) width 151: "This should be centered. " - RenderPartObject {OBJECT} at (317,159) size 300x150 + RenderEmbeddedObject {OBJECT} at (317,159) size 300x150 layer at (0,0) size 300x150 RenderView at (0,0) size 300x150 layer at (0,0) size 300x150 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.txt index 5630d99..5752de0 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/replaced-breaking-expected.txt @@ -59,8 +59,8 @@ layer at (0,0) size 800x600 RenderBlock {HTML} at (0,0) size 25x25 RenderBody {BODY} at (8,8) size 9x9 RenderText {#text} at (0,0) size 0x0 - RenderPartObject {EMBED} at (1,529) size 27x27 [border: (1px solid #000000)] - RenderPartObject {EMBED} at (1,556) size 27x27 [border: (1px solid #000000)] + RenderEmbeddedObject {EMBED} at (1,529) size 27x27 [border: (1px solid #000000)] + RenderEmbeddedObject {EMBED} at (1,556) size 27x27 [border: (1px solid #000000)] RenderText {#text} at (0,0) size 0x0 layer at (13,14) size 151x16 RenderBlock {DIV} at (2,3) size 151x16 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/embed-attributes-style-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/embed-attributes-style-expected.txt index 7e5f2ef..6966d4c 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/embed-attributes-style-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/embed-attributes-style-expected.txt @@ -11,17 +11,17 @@ layer at (0,0) size 800x600 RenderBlock {HR} at (0,56) size 784x2 [border: (1px inset #000000)] RenderBlock {DIV} at (0,66) size 784x0 RenderBlock {DIV} at (0,66) size 784x105 - RenderPartObject {EMBED} at (0,0) size 50x100 + RenderEmbeddedObject {EMBED} at (0,0) size 50x100 RenderText {#text} at (50,85) size 115x19 text run at (50,85) width 4: " " text run at (54,85) width 111: "valign top attribute" RenderBlock {DIV} at (0,171) size 784x105 - RenderPartObject {EMBED} at (0,0) size 50x100 + RenderEmbeddedObject {EMBED} at (0,0) size 50x100 RenderText {#text} at (50,85) size 125x19 text run at (50,85) width 4: " " text run at (54,85) width 121: "border 5px attribute" RenderBlock {DIV} at (0,276) size 784x107 - RenderPartObject {EMBED} at (0,0) size 52x102 [border: (1px dashed #000000)] + RenderEmbeddedObject {EMBED} at (0,0) size 52x102 [border: (1px dashed #000000)] RenderText {#text} at (52,87) size 97x19 text run at (52,87) width 4: " " text run at (56,87) width 93: "hidden attribute" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/netscape-dom-access-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/netscape-dom-access-expected.txt index e931472..0ab9268 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/netscape-dom-access-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/plugins/netscape-dom-access-expected.txt @@ -8,7 +8,7 @@ layer at (0,0) size 800x600 text run at (0,0) width 488: "This page tests whether Netscape plug-ins can access their own DOM elements. " text run at (488,0) width 254: "The plug-in should have a 3px red border." RenderBlock (anonymous) at (0,36) size 784x206 - RenderPartObject {EMBED} at (0,0) size 206x206 [border: (3px solid #FF0000)] + RenderEmbeddedObject {EMBED} at (0,0) size 206x206 [border: (3px solid #FF0000)] RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/getsvgdocument-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/getsvgdocument-expected.txt index d8c68a2..742baaa 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/getsvgdocument-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/getsvgdocument-expected.txt @@ -8,7 +8,7 @@ layer at (0,0) size 800x600 text run at (0,0) width 771: "This tests to see if HTMLEmbedElement.getSVGDocument() and HTMLObjectElement.getSVGDocument() work. You should" text run at (0,20) width 243: "see SUCCESS printed twice below this:" RenderBlock (anonymous) at (0,56) size 784x60 - RenderPartObject {EMBED} at (0,0) size 85x20 + RenderEmbeddedObject {EMBED} at (0,0) size 85x20 layer at (0,0) size 85x20 RenderView at (0,0) size 85x20 layer at (0,0) size 85x20 @@ -19,7 +19,7 @@ layer at (0,0) size 800x600 chunk 1 text run 1 at (5.00,16.00) startOffset 0 endOffset 7 width 69.00: "SUCCESS" RenderBR {BR} at (85,20) size 0x0 RenderBR {BR} at (0,20) size 0x19 - RenderPartObject {OBJECT} at (0,40) size 85x20 + RenderEmbeddedObject {OBJECT} at (0,40) size 85x20 layer at (0,0) size 85x20 RenderView at (0,0) size 85x20 layer at (0,0) size 85x20 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt index 26c2380..0ee8a13 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem-expected.txt @@ -54,7 +54,7 @@ layer at (0,0) size 1026x1056 text run at (198,9) width 100: "PNG Image" RenderTableRow {TR} at (0,149) size 998x381 RenderTableCell {TD} at (2,149) size 496x381 [r=2 c=0 rs=1 cs=1] - RenderPartObject {EMBED} at (8,8) size 480x360 + RenderEmbeddedObject {EMBED} at (8,8) size 480x360 layer at (0,0) size 480x360 RenderView at (0,0) size 480x360 layer at (0,0) size 480x360 diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index fff1a67..bfad54b 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -3146,20 +3146,4 @@ BUG31642 LINUX DEBUG: LayoutTests/svg/W3C-SVG-1.1/animate-elem-30-t.svg = IMAGE+ BUG_JAPHET MAC : LayoutTests/svg/custom/marker-strokeWidth-changes.svg = FAIL BUG_JAPHET WIN : LayoutTests/svg/custom/feDisplacementMap-01.svg = TEXT BUG_JAPHET WIN : LayoutTests/svg/W3C-SVG-1.1/masking-intro-01-f.svg = IMAGE -BUG_JAPHET : LayoutTests/websocket/tests/frame-lengths.html = PASS TIMEOUT - -// WebKit Roll 52943:52952 -// All rebaselines!!! WOOO!! Due to: http://trac.webkit.org/changeset/52947 -BUG_DGLAZKOV WIN LINUX : LayoutTests/editing/pasteboard/pasting-object.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/block/basic/013.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/dom/HTMLObjectElement/vspace-hspace-as-number.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/dynamic/flash-replacement-test.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/frames/001.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/invalid/residual-style.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/parser/001.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/replaced/007.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/fast/replaced/replaced-breaking.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/plugins/embed-attributes-style.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/plugins/netscape-dom-access.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/svg/custom/getsvgdocument.html = TEXT -BUG_DGLAZKOV WIN LINUX : LayoutTests/svg/custom/scrolling-embedded-svg-file-image-repaint-problem.html = TEXT
\ No newline at end of file +BUG_JAPHET : LayoutTests/websocket/tests/frame-lengths.html = PASS TIMEOUT
\ No newline at end of file |
