From 68513a70bcd92384395513322f1b801e7bf9c729 Mon Sep 17 00:00:00 2001 From: Steve Block Date: Wed, 29 Sep 2010 17:32:26 +0100 Subject: Merge WebKit at r67908: Initial merge by Git Change-Id: I43a553e7b3299b28cb6ee8aa035ed70fe342b972 --- .../script-tests/clear-watch-invalid-id-crash.js | 8 +++-- .../HTMLFontElement/script-tests/size-attribute.js | 37 +++++++++++++++++++++- .../HTMLFontElement/size-attribute-expected.txt | 32 ++++++++++++++++++- .../remove-frame-in-beforeload-listener.html | 4 +++ 4 files changed, 76 insertions(+), 5 deletions(-) (limited to 'LayoutTests/fast') diff --git a/LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js b/LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js index 6176da0..0f9cb58 100644 --- a/LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js +++ b/LayoutTests/fast/dom/Geolocation/script-tests/clear-watch-invalid-id-crash.js @@ -6,9 +6,11 @@ if (window.layoutTestController) { } else debug('This test can not be run without the LayoutTestController'); -navigator.geolocation.watchPosition(function() {}); -navigator.geolocation.clearWatch(0); -location = "data:text/html,TEST COMPLETE"; +document.body.onload = function() { + navigator.geolocation.watchPosition(function() {}); + navigator.geolocation.clearWatch(0); + location = "data:text/html,TEST COMPLETE"; +} window.jsTestIsAsync = true; window.successfullyParsed = true; diff --git a/LayoutTests/fast/dom/HTMLFontElement/script-tests/size-attribute.js b/LayoutTests/fast/dom/HTMLFontElement/script-tests/size-attribute.js index 3e090b1..2e32331 100644 --- a/LayoutTests/fast/dom/HTMLFontElement/script-tests/size-attribute.js +++ b/LayoutTests/fast/dom/HTMLFontElement/script-tests/size-attribute.js @@ -24,7 +24,7 @@ shouldBe('fontSizeAttributeEffect("5")', '"24px"'); shouldBe('fontSizeAttributeEffect("6")', '"32px"'); shouldBe('fontSizeAttributeEffect("7")', '"48px"'); -shouldBe('fontSizeAttributeEffect("0")', '"16px"'); // Gecko and WebKit do not agree on this result. Which matches IE? +shouldBe('fontSizeAttributeEffect("0")', '"10px"'); shouldBe('fontSizeAttributeEffect("-1")', '"13px"'); shouldBe('fontSizeAttributeEffect("-2")', '"10px"'); @@ -37,6 +37,41 @@ shouldBe('fontSizeAttributeEffect("-8")', '"10px"'); shouldBe('fontSizeAttributeEffect("-9")', '"10px"'); shouldBe('fontSizeAttributeEffect("-10")', '"10px"'); +shouldBe('fontSizeAttributeEffect("x6")', 'null'); +shouldBe('fontSizeAttributeEffect(" 6")', '"32px"'); +shouldBe('fontSizeAttributeEffect("\\t6")', '"32px"'); +shouldBe('fontSizeAttributeEffect("\\r6")', '"32px"'); +shouldBe('fontSizeAttributeEffect("\\n6")', '"32px"'); +shouldBe('fontSizeAttributeEffect("\\u20086")', 'null'); + +shouldBe('fontSizeAttributeEffect("x-6")', 'null'); +shouldBe('fontSizeAttributeEffect(" -6")', '"10px"'); +shouldBe('fontSizeAttributeEffect("\\t-6")', '"10px"'); +shouldBe('fontSizeAttributeEffect("\\r-6")', '"10px"'); +shouldBe('fontSizeAttributeEffect("\\n-6")', '"10px"'); +shouldBe('fontSizeAttributeEffect("\\u2008-6")', 'null'); + +shouldBe('fontSizeAttributeEffect("x+6")', 'null'); +shouldBe('fontSizeAttributeEffect(" +6")', '"48px"'); +shouldBe('fontSizeAttributeEffect("\\t+6")', '"48px"'); +shouldBe('fontSizeAttributeEffect("\\r+6")', '"48px"'); +shouldBe('fontSizeAttributeEffect("\\n+6")', '"48px"'); +shouldBe('fontSizeAttributeEffect("\\u2008+6")', 'null'); + +shouldBe('fontSizeAttributeEffect("x+x6")', 'null'); +shouldBe('fontSizeAttributeEffect(" + 6")', 'null'); +shouldBe('fontSizeAttributeEffect("\\t+\\t6")', 'null'); +shouldBe('fontSizeAttributeEffect("\\r+\\r6")', 'null'); +shouldBe('fontSizeAttributeEffect("\\n+\\n6")', 'null'); +shouldBe('fontSizeAttributeEffect("\\u2008+\\u20086")', 'null'); + +shouldBe('fontSizeAttributeEffect("x-x6")', 'null'); +shouldBe('fontSizeAttributeEffect(" - 6")', 'null'); +shouldBe('fontSizeAttributeEffect("\\t-\\t6")', 'null'); +shouldBe('fontSizeAttributeEffect("\\r-\\r6")', 'null'); +shouldBe('fontSizeAttributeEffect("\\n-\\n6")', 'null'); +shouldBe('fontSizeAttributeEffect("\\u2008-\\u20086")', 'null'); + shouldBe('fontSizeAttributeEffect("8")', '"48px"'); shouldBe('fontSizeAttributeEffect("9")', '"48px"'); shouldBe('fontSizeAttributeEffect("10")', '"48px"'); diff --git a/LayoutTests/fast/dom/HTMLFontElement/size-attribute-expected.txt b/LayoutTests/fast/dom/HTMLFontElement/size-attribute-expected.txt index 28d44af..53d19e4 100644 --- a/LayoutTests/fast/dom/HTMLFontElement/size-attribute-expected.txt +++ b/LayoutTests/fast/dom/HTMLFontElement/size-attribute-expected.txt @@ -11,7 +11,7 @@ PASS fontSizeAttributeEffect("4") is "18px" PASS fontSizeAttributeEffect("5") is "24px" PASS fontSizeAttributeEffect("6") is "32px" PASS fontSizeAttributeEffect("7") is "48px" -PASS fontSizeAttributeEffect("0") is "16px" +PASS fontSizeAttributeEffect("0") is "10px" PASS fontSizeAttributeEffect("-1") is "13px" PASS fontSizeAttributeEffect("-2") is "10px" PASS fontSizeAttributeEffect("-3") is "10px" @@ -22,6 +22,36 @@ PASS fontSizeAttributeEffect("-7") is "10px" PASS fontSizeAttributeEffect("-8") is "10px" PASS fontSizeAttributeEffect("-9") is "10px" PASS fontSizeAttributeEffect("-10") is "10px" +PASS fontSizeAttributeEffect("x6") is null +PASS fontSizeAttributeEffect(" 6") is "32px" +PASS fontSizeAttributeEffect("\t6") is "32px" +PASS fontSizeAttributeEffect("\r6") is "32px" +PASS fontSizeAttributeEffect("\n6") is "32px" +PASS fontSizeAttributeEffect("\u20086") is null +PASS fontSizeAttributeEffect("x-6") is null +PASS fontSizeAttributeEffect(" -6") is "10px" +PASS fontSizeAttributeEffect("\t-6") is "10px" +PASS fontSizeAttributeEffect("\r-6") is "10px" +PASS fontSizeAttributeEffect("\n-6") is "10px" +PASS fontSizeAttributeEffect("\u2008-6") is null +PASS fontSizeAttributeEffect("x+6") is null +PASS fontSizeAttributeEffect(" +6") is "48px" +PASS fontSizeAttributeEffect("\t+6") is "48px" +PASS fontSizeAttributeEffect("\r+6") is "48px" +PASS fontSizeAttributeEffect("\n+6") is "48px" +PASS fontSizeAttributeEffect("\u2008+6") is null +PASS fontSizeAttributeEffect("x+x6") is null +PASS fontSizeAttributeEffect(" + 6") is null +PASS fontSizeAttributeEffect("\t+\t6") is null +PASS fontSizeAttributeEffect("\r+\r6") is null +PASS fontSizeAttributeEffect("\n+\n6") is null +PASS fontSizeAttributeEffect("\u2008+\u20086") is null +PASS fontSizeAttributeEffect("x-x6") is null +PASS fontSizeAttributeEffect(" - 6") is null +PASS fontSizeAttributeEffect("\t-\t6") is null +PASS fontSizeAttributeEffect("\r-\r6") is null +PASS fontSizeAttributeEffect("\n-\n6") is null +PASS fontSizeAttributeEffect("\u2008-\u20086") is null PASS fontSizeAttributeEffect("8") is "48px" PASS fontSizeAttributeEffect("9") is "48px" PASS fontSizeAttributeEffect("10") is "48px" diff --git a/LayoutTests/fast/dom/beforeload/remove-frame-in-beforeload-listener.html b/LayoutTests/fast/dom/beforeload/remove-frame-in-beforeload-listener.html index fe45195..8d0f514 100644 --- a/LayoutTests/fast/dom/beforeload/remove-frame-in-beforeload-listener.html +++ b/LayoutTests/fast/dom/beforeload/remove-frame-in-beforeload-listener.html @@ -8,6 +8,10 @@ document.addEventListener("beforeload", function(event) { if (event.target && event.target.parentElement) event.target.parentElement.removeChild(event.target); + // Note, we intentionally do not cancel the load here, + // WebCore should automatically cancel it. + // Otherwise DRT will print: + // Blocked access to external URL http://webkit.org/ }, true); -- cgit v1.1