diff options
author | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 03:05:55 +0000 |
---|---|---|
committer | dpranke@google.com <dpranke@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-11-19 03:05:55 +0000 |
commit | c391387ed7ccbd6e252d9d2f4c834c880722f4ac (patch) | |
tree | f4bc41b27f70f3515b2629ecf2c1b022e3323f20 | |
parent | 54d6d1e8558294da523990b9548a50a3087c12ed (diff) | |
download | chromium_src-c391387ed7ccbd6e252d9d2f4c834c880722f4ac.zip chromium_src-c391387ed7ccbd6e252d9d2f4c834c880722f4ac.tar.gz chromium_src-c391387ed7ccbd6e252d9d2f4c834c880722f4ac.tar.bz2 |
Fix bug 27217 - disable Java in test_shell by default, to match
DumpRenderTree's behavior. This causes a couple other tests to produce
output that could be construed as "failing" (in the way that upstream fails
as well). I will file a separate bug in webkit to figure out what to do
about them.
R=eseidel@chromium.org
BUG=27217
TEST=LayoutTests/fast/replaced/applet-rendering-java-disabled.html
Review URL: http://codereview.chromium.org/405026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@32479 0039d316-1c4b-4281-b951-d872f2087c98
17 files changed, 200 insertions, 44 deletions
diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-disabled-positioned-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-disabled-positioned-expected.checksum index 8e8d35a..0bf6b51 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-disabled-positioned-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-disabled-positioned-expected.checksum @@ -1 +1 @@ -685c6b1ae783c6b780011442b850bf74
\ No newline at end of file +3e0f7de600c99f7cf53824a996ca74dd
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-disabled-positioned-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-disabled-positioned-expected.png Binary files differindex 28110b9..fb4956c 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-disabled-positioned-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-disabled-positioned-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.checksum b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.checksum index 046808d..78ebd02 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.checksum @@ -1 +1 @@ -bb748298b16c1d63276483c1746aa609
\ No newline at end of file +090baa9f5d753f78125f1ac523ad4917
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.png b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.png Binary files differindex 310a888..cdf4c46 100644 --- a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.png +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.txt b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.txt new file mode 100644 index 0000000..e62c68d --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-linux/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.txt @@ -0,0 +1,118 @@ +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 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {P} at (0,0) size 784x60 + RenderText {#text} at (0,0) size 778x59 + text run at (0,0) width 778: "This table contains an <applet> that will not load -- you can see the space get allocated and then reflow. Notice that the final table" + text run at (0,20) width 528: "is clipped on the right hand side -- try shrinking the window and notice how the clipping " + text run at (528,20) width 233: "increases. (I couldn't really simplify this" + text run at (0,40) width 203: "further without losing some of the " + text run at (203,40) width 103: "original 'flavour'.)" + RenderBlock (anonymous) at (0,76) size 784x20 + RenderBR {BR} at (0,0) size 0x19 + RenderTable {TABLE} at (0,96) size 773x175 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 771x173 + RenderTableRow {TR} at (0,2) size 771x169 + RenderTableCell {TD} at (2,2) size 767x169 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,2) size 763x165 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 761x163 + RenderTableRow {TR} at (0,2) size 761x99 + RenderTableCell {TD} at (2,2) size 757x99 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (152,2) size 452x39 [border: (2px outset #808080)] + RenderTableSection {TBODY} at (2,2) size 448x35 + RenderTableRow {TR} at (0,2) size 448x31 + RenderTableCell {TD} at (2,2) size 444x31 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderApplet {APPLET} at (2,2) size 440x27 + RenderText {#text} at (0,0) size 0x0 + RenderBlock {P} at (2,57) size 753x40 + RenderText {#text} at (0,0) size 738x39 + text run at (0,0) width 407: "The Porto Elounda Mare is built on the sea front, on a 110,000 m2 " + text run at (407,0) width 331: "plot of land with a 150 meter long private sandy beach." + text run at (0,20) width 91: "The view from " + text run at (91,20) width 363: "decorated with antique and contemporary furniture and rugs." + RenderTableRow {TR} at (0,103) size 761x58 + RenderTableCell {TD} at (2,103) size 757x58 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,2) size 753x54 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 751x52 + RenderTableRow {TR} at (0,0) size 751x52 + RenderTableCell {TD} at (0,10) size 293x32 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (6,6) size 281x19 + text run at (6,6) width 130: "99 Rates in Drahmas " + text run at (136,6) width 119: "Per Person on H/B " + text run at (255,6) width 32: "Basis" + RenderTableCell {TD} at (293,0) size 102x52 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 90x19 + text run at (6,6) width 90: "27/03 - 30/04 " + RenderBR {BR} at (96,21) size 0x0 + RenderText {#text} at (6,26) size 86x19 + text run at (6,26) width 86: "16/10 - 31/10" + RenderTableCell {TD} at (395,10) size 176x32 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (6,6) size 164x19 + text run at (6,6) width 164: "01/5- 21/5 & 2/10 - 15/10" + RenderTableCell {TD} at (571,0) size 90x52 [border: (1px inset #808080)] [r=0 c=3 rs=1 cs=1] + RenderText {#text} at (6,6) size 78x19 + text run at (6,6) width 78: "22/5 - 16/07" + RenderBR {BR} at (84,21) size 0x0 + RenderText {#text} at (6,26) size 78x19 + text run at (6,26) width 78: "28/8 - 01/10" + RenderTableCell {TD} at (661,10) size 90x32 [border: (1px inset #808080)] [r=0 c=4 rs=1 cs=1] + RenderText {#text} at (6,6) size 78x19 + text run at (6,6) width 78: "17/07 - 27/8" + RenderBlock (anonymous) at (0,271) size 784x20 + RenderBR {BR} at (0,0) size 0x19 + RenderBlock {P} at (0,307) size 784x20 + RenderText {#text} at (0,0) size 518x19 + text run at (0,0) width 402: "This table repeats the previous table, but removes the 'bad applet'. " + text run at (402,0) width 116: "Table lays out OK." + RenderBlock (anonymous) at (0,343) size 784x20 + RenderBR {BR} at (0,0) size 0x19 + RenderTable {TABLE} at (0,363) size 773x168 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 771x166 + RenderTableRow {TR} at (0,2) size 771x162 + RenderTableCell {TD} at (2,2) size 767x162 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,2) size 763x158 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 761x156 + RenderTableRow {TR} at (0,2) size 761x92 + RenderTableCell {TD} at (2,2) size 757x92 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (325,2) size 107x32 [border: (2px outset #808080)] + RenderTableSection {TBODY} at (2,2) size 103x28 + RenderTableRow {TR} at (0,2) size 103x24 + RenderTableCell {TD} at (2,2) size 99x24 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (2,2) size 95x19 + text run at (2,2) width 95: "applet was here" + RenderBlock {P} at (2,50) size 753x40 + RenderText {#text} at (0,0) size 738x39 + text run at (0,0) width 407: "The Porto Elounda Mare is built on the sea front, on a 110,000 m2 " + text run at (407,0) width 331: "plot of land with a 150 meter long private sandy beach." + text run at (0,20) width 91: "The view from " + text run at (91,20) width 363: "decorated with antique and contemporary furniture and rugs." + RenderTableRow {TR} at (0,96) size 761x58 + RenderTableCell {TD} at (2,96) size 757x58 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,2) size 753x54 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 751x52 + RenderTableRow {TR} at (0,0) size 751x52 + RenderTableCell {TD} at (0,10) size 293x32 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderText {#text} at (6,6) size 281x19 + text run at (6,6) width 130: "99 Rates in Drahmas " + text run at (136,6) width 119: "Per Person on H/B " + text run at (255,6) width 32: "Basis" + RenderTableCell {TD} at (293,0) size 102x52 [border: (1px inset #808080)] [r=0 c=1 rs=1 cs=1] + RenderText {#text} at (6,6) size 90x19 + text run at (6,6) width 90: "27/03 - 30/04 " + RenderBR {BR} at (96,21) size 0x0 + RenderText {#text} at (6,26) size 86x19 + text run at (6,26) width 86: "16/10 - 31/10" + RenderTableCell {TD} at (395,10) size 176x32 [border: (1px inset #808080)] [r=0 c=2 rs=1 cs=1] + RenderText {#text} at (6,6) size 164x19 + text run at (6,6) width 164: "01/5- 21/5 & 2/10 - 15/10" + RenderTableCell {TD} at (571,0) size 90x52 [border: (1px inset #808080)] [r=0 c=3 rs=1 cs=1] + RenderText {#text} at (6,6) size 78x19 + text run at (6,6) width 78: "22/5 - 16/07" + RenderBR {BR} at (84,21) size 0x0 + RenderText {#text} at (6,26) size 78x19 + text run at (6,26) width 78: "28/8 - 01/10" + RenderTableCell {TD} at (661,10) size 90x32 [border: (1px inset #808080)] [r=0 c=4 rs=1 cs=1] + RenderText {#text} at (6,6) size 78x19 + text run at (6,6) width 78: "17/07 - 27/8" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/java-applet-calls-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/java-applet-calls-expected.txt index f8d9de3..47a6c29 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/java-applet-calls-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/dom/java-applet-calls-expected.txt @@ -1,11 +1,9 @@ -Requires Java plugin installed and enabled. This tests that calling functions on Java Applet works.
-
-On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-
-
-
-PASS document.testapplet.getString() == 'abcdefg' is true
-PASS successfullyParsed is true
-
-TEST COMPLETE
-
+Requires Java plugin installed and enabled. This tests that calling functions on Java Applet works. + +On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". + + + FAIL document.testapplet.getString() == 'abcdefg' should be true. Threw exception TypeError: Object #<an HTMLAppletElement> has no method 'getString' +PASS successfullyParsed is true + +TEST COMPLETE diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.checksum index 8250dda..2bdfcc4 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.checksum @@ -1 +1 @@ -3c77dc44c45da83bfe954d79d377b115
\ No newline at end of file +1d11b7315a424c6cb537ac170ebb11df
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.png Binary files differindex a55d32d..efb531f 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.txt new file mode 100644 index 0000000..cf5e646 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-disabled-positioned-expected.txt @@ -0,0 +1,25 @@ +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 + RenderBody {BODY} at (8,8) size 784x576 + RenderBlock {P} at (0,0) size 784x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "Test for " + RenderInline {I} at (0,0) size 648x19 + RenderInline {A} at (0,0) size 305x19 [color=#0000EE] + RenderText {#text} at (51,0) size 305x19 + text run at (51,0) width 305: "http://bugs.webkit.org/show_bug.cgi?id=15091" + RenderText {#text} at (356,0) size 343x19 + text run at (356,0) width 4: " " + text run at (360,0) width 253: "Crash in RenderBlock::skipWhitespace " + text run at (613,0) width 86: "during layout" + RenderText {#text} at (699,0) size 4x19 + text run at (699,0) width 4: "." + RenderBlock {P} at (0,36) size 784x20 + RenderText {#text} at (0,0) size 579x19 + text run at (0,0) width 579: "If Java is enabled, disable it and reload this page. You should see the word PASS at the bottom." +layer at (8,580) size 38x20 + RenderBlock (positioned) {APPLET} at (8,580) size 38x20 + RenderText {#text} at (0,0) size 38x19 + text run at (0,0) width 38: "PASS" diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.checksum index 04b4526..edf6d81 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.checksum @@ -1 +1 @@ -ca5d04e134054054a820f0c8ebcc8681
\ No newline at end of file +9536a3cdf0918e5fc14f8c56b44eebe5
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.png Binary files differindex 6871c1f..cc9875b 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.txt new file mode 100644 index 0000000..2d6dcc3 --- /dev/null +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/replaced/applet-rendering-java-disabled-expected.txt @@ -0,0 +1,20 @@ +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 + RenderBody {BODY} at (8,8) size 784x584 + RenderBlock {P} at (0,0) size 784x20 + RenderText {#text} at (0,0) size 51x19 + text run at (0,0) width 51: "Test for " + RenderInline {A} at (0,0) size 323x19 [color=#0000EE] + RenderText {#text} at (51,0) size 323x19 + text run at (51,0) width 323: "http://bugzilla.opendarwin.org/show_bug.cgi?id=7281" + RenderBlock {P} at (0,36) size 784x40 + RenderText {#text} at (0,0) size 779x39 + text run at (0,0) width 779: "This tests rendering of an applet element with Java disabled. If Java is disabled and Safari shows the content in the applet tag, then" + text run at (0,20) width 93: "the test passed." + RenderBlock (anonymous) at (0,92) size 784x20 + RenderInline {APPLET} at (0,0) size 69x19 + RenderText {#text} at (0,0) size 69x19 + text run at (0,0) width 69: "SUCCESS" + RenderText {#text} at (0,0) size 0x0 diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.checksum b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.checksum index a37062f..e0713d3 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.checksum +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.checksum @@ -1 +1 @@ -8269c381664b298c154af20e52e4bf5e
\ No newline at end of file +7d92a5fce8ba55331d89229352744084
\ No newline at end of file diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.png b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.png Binary files differindex 452a51d..f3a8090 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.png +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.png diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.txt index e62c68d..28cacf2 100644 --- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.txt +++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/tables/mozilla_expected_failures/bugs/bug8499-expected.txt @@ -12,28 +12,30 @@ layer at (0,0) size 800x600 text run at (203,40) width 103: "original 'flavour'.)" RenderBlock (anonymous) at (0,76) size 784x20 RenderBR {BR} at (0,0) size 0x19 - RenderTable {TABLE} at (0,96) size 773x175 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 771x173 - RenderTableRow {TR} at (0,2) size 771x169 - RenderTableCell {TD} at (2,2) size 767x169 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderTable {TABLE} at (2,2) size 763x165 [border: (1px outset #808080)] - RenderTableSection {TBODY} at (1,1) size 761x163 - RenderTableRow {TR} at (0,2) size 761x99 - RenderTableCell {TD} at (2,2) size 757x99 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderTable {TABLE} at (152,2) size 452x39 [border: (2px outset #808080)] - RenderTableSection {TBODY} at (2,2) size 448x35 - RenderTableRow {TR} at (0,2) size 448x31 - RenderTableCell {TD} at (2,2) size 444x31 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] - RenderApplet {APPLET} at (2,2) size 440x27 + RenderTable {TABLE} at (0,96) size 773x148 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 771x146 + RenderTableRow {TR} at (0,2) size 771x142 + RenderTableCell {TD} at (2,2) size 767x142 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (2,2) size 763x138 [border: (1px outset #808080)] + RenderTableSection {TBODY} at (1,1) size 761x136 + RenderTableRow {TR} at (0,2) size 761x72 + RenderTableCell {TD} at (2,2) size 757x72 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderTable {TABLE} at (372,2) size 12x12 [border: (2px outset #808080)] + RenderTableSection {TBODY} at (2,2) size 8x8 + RenderTableRow {TR} at (0,2) size 8x4 + RenderTableCell {TD} at (2,2) size 4x4 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] + RenderInline {APPLET} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 + RenderText {#text} at (0,0) size 0x0 RenderText {#text} at (0,0) size 0x0 - RenderBlock {P} at (2,57) size 753x40 + RenderBlock {P} at (2,30) size 753x40 RenderText {#text} at (0,0) size 738x39 text run at (0,0) width 407: "The Porto Elounda Mare is built on the sea front, on a 110,000 m2 " text run at (407,0) width 331: "plot of land with a 150 meter long private sandy beach." text run at (0,20) width 91: "The view from " text run at (91,20) width 363: "decorated with antique and contemporary furniture and rugs." - RenderTableRow {TR} at (0,103) size 761x58 - RenderTableCell {TD} at (2,103) size 757x58 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] + RenderTableRow {TR} at (0,76) size 761x58 + RenderTableCell {TD} at (2,76) size 757x58 [border: (1px inset #808080)] [r=1 c=0 rs=1 cs=1] RenderTable {TABLE} at (2,2) size 753x54 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 751x52 RenderTableRow {TR} at (0,0) size 751x52 @@ -60,15 +62,15 @@ layer at (0,0) size 800x600 RenderTableCell {TD} at (661,10) size 90x32 [border: (1px inset #808080)] [r=0 c=4 rs=1 cs=1] RenderText {#text} at (6,6) size 78x19 text run at (6,6) width 78: "17/07 - 27/8" - RenderBlock (anonymous) at (0,271) size 784x20 + RenderBlock (anonymous) at (0,244) size 784x20 RenderBR {BR} at (0,0) size 0x19 - RenderBlock {P} at (0,307) size 784x20 + RenderBlock {P} at (0,280) size 784x20 RenderText {#text} at (0,0) size 518x19 text run at (0,0) width 402: "This table repeats the previous table, but removes the 'bad applet'. " text run at (402,0) width 116: "Table lays out OK." - RenderBlock (anonymous) at (0,343) size 784x20 + RenderBlock (anonymous) at (0,316) size 784x20 RenderBR {BR} at (0,0) size 0x19 - RenderTable {TABLE} at (0,363) size 773x168 [border: (1px outset #808080)] + RenderTable {TABLE} at (0,336) size 773x168 [border: (1px outset #808080)] RenderTableSection {TBODY} at (1,1) size 771x166 RenderTableRow {TR} at (0,2) size 771x162 RenderTableCell {TD} at (2,2) size 767x162 [border: (1px inset #808080)] [r=0 c=0 rs=1 cs=1] diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index 8efa528..be04b8e 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -644,13 +644,6 @@ BUG21901 : LayoutTests/plugins/netscape-enumerate.html = FAIL // it doesn't need to block the current release BUG10275 : LayoutTests/http/tests/security/cross-frame-access-put.html = FAIL -// TODO(joshia): Need some changes to the test shell in order to support -// Java applet related unit tests. So disable the following for now. -BUG27217 DEBUG : LayoutTests/fast/replaced/applet-disabled-positioned.html = FAIL -BUG27217 LINUX MAC RELEASE : LayoutTests/fast/replaced/applet-disabled-positioned.html = FAIL -BUG27217 SLOW WIN RELEASE : LayoutTests/fast/replaced/applet-disabled-positioned.html = FAIL -BUG27217 : LayoutTests/fast/replaced/applet-rendering-java-disabled.html = FAIL - // Due to differences in error pages. Needs re-baselining. BUG24208 WIN DEBUG : LayoutTests/http/tests/navigation/post-goback1.html = FAIL BUG24208 SLOW WIN RELEASE : LayoutTests/http/tests/navigation/post-goback1.html = FAIL diff --git a/webkit/tools/test_shell/test_shell.cc b/webkit/tools/test_shell/test_shell.cc index d6052ae..30f34a6 100644 --- a/webkit/tools/test_shell/test_shell.cc +++ b/webkit/tools/test_shell/test_shell.cc @@ -434,7 +434,7 @@ void TestShell::ResetWebPreferences() { web_prefs_->shrinks_standalone_images_to_fit = false; web_prefs_->uses_universal_detector = false; web_prefs_->text_areas_are_resizable = false; - web_prefs_->java_enabled = true; + web_prefs_->java_enabled = false; web_prefs_->allow_scripts_to_close_windows = false; web_prefs_->xss_auditor_enabled = false; // It's off by default for Chrome, but we don't want to |