diff options
| author | eseidel <eseidel@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2006-03-21 06:46:47 +0000 |
|---|---|---|
| committer | eseidel <eseidel@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2006-03-21 06:46:47 +0000 |
| commit | b565e47a6707510bea9968c5c443b92734b6e916 (patch) | |
| tree | f811ca94eeca91542ed65abb1bddbf56658c644a /third_party/WebKit/LayoutTests/fast | |
| parent | 4036db73ae31e9e6d2670ff809e14977650a9901 (diff) | |
| download | chromium_src-b565e47a6707510bea9968c5c443b92734b6e916.zip chromium_src-b565e47a6707510bea9968c5c443b92734b6e916.tar.gz chromium_src-b565e47a6707510bea9968c5c443b92734b6e916.tar.bz2 | |
2006-03-20 Eric Seidel <eseidel@apple.com>
Reviewed by mjs.
Fix tokenizer crash when document.open() is called from an external script:
<rdar://problem/4483882> REGRESSION (417.8-TOT): crash at yourmovies.com.au in WebCore::HTMLTokenizer::reset() + 92 (7818)
* dom/Document.cpp:
(WebCore::Document::open): Check to make sure the current tokenizer isn't executing a script
* dom/xml_tokenizer.h:
(WebCore::Tokenizer::executingScript): Add a way for others to know if scripts are executing.
* html/HTMLTokenizer.cpp:
(WebCore::HTMLTokenizer::scriptExecution): Wire into existing m_executingScript member var.
* html/HTMLTokenizer.h:
(WebCore::HTMLTokenizer::executingScript):
* kcanvas/device/quartz/KCanvasFilterQuartz.mm:
(WebCore::KCanvasFilterQuartz::prepareFilter): Unrelated code cleanup.
git-svn-id: svn://svn.chromium.org/blink/trunk@13413 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/fast')
8 files changed, 39 insertions, 0 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/external-script-document-open-expected.txt b/third_party/WebKit/LayoutTests/fast/tokenizer/external-script-document-open-expected.txt new file mode 100644 index 0000000..334f595 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/external-script-document-open-expected.txt @@ -0,0 +1,3 @@ +SUCCESS (1 of 2) + +SUCCESS (2 of 2) diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/external-script-document-open.html b/third_party/WebKit/LayoutTests/fast/tokenizer/external-script-document-open.html new file mode 100644 index 0000000..d6b403b --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/external-script-document-open.html @@ -0,0 +1,2 @@ +<p>SUCCESS (1 of 2)</p> +<script type="text/javascript" src="resources/external-script-document-open.js"></script> diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/resources/external-script-document-open.js b/third_party/WebKit/LayoutTests/fast/tokenizer/resources/external-script-document-open.js new file mode 100644 index 0000000..418aa94 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/resources/external-script-document-open.js @@ -0,0 +1,4 @@ +if (window.layoutTestController) + layoutTestController.dumpAsText(); +document.open() +document.write("SUCCESS (2 of 2)"); diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/resources/write-external-script-open.js b/third_party/WebKit/LayoutTests/fast/tokenizer/resources/write-external-script-open.js new file mode 100644 index 0000000..1fc67e5 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/resources/write-external-script-open.js @@ -0,0 +1,2 @@ +document.open(); +document.write('<br>SUCCESS (2 of 2)<br>'); diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/write-external-script-open-expected.txt b/third_party/WebKit/LayoutTests/fast/tokenizer/write-external-script-open-expected.txt new file mode 100644 index 0000000..b50027d --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/write-external-script-open-expected.txt @@ -0,0 +1,3 @@ +SUCCESS (1 of 2) +SUCCESS (2 of 2) + diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/write-external-script-open.html b/third_party/WebKit/LayoutTests/fast/tokenizer/write-external-script-open.html new file mode 100644 index 0000000..9c968db --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/write-external-script-open.html @@ -0,0 +1,11 @@ +<body onload="test()"> +FAILURE +<script> +if (window.layoutTestController) + layoutTestController.dumpAsText(); +function test() +{ + document.write("SUCCESS (1 of 2)<script src='resources/write-external-script-open.js'></scr" + "ipt>"); +} +</script> +</body> diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/write-inline-script-open-expected.txt b/third_party/WebKit/LayoutTests/fast/tokenizer/write-inline-script-open-expected.txt new file mode 100644 index 0000000..b50027d --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/write-inline-script-open-expected.txt @@ -0,0 +1,3 @@ +SUCCESS (1 of 2) +SUCCESS (2 of 2) + diff --git a/third_party/WebKit/LayoutTests/fast/tokenizer/write-inline-script-open.html b/third_party/WebKit/LayoutTests/fast/tokenizer/write-inline-script-open.html new file mode 100644 index 0000000..83d5b67 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/tokenizer/write-inline-script-open.html @@ -0,0 +1,11 @@ +<body onload="test()"> +FAILURE +<script> +if (window.layoutTestController) + layoutTestController.dumpAsText(); +function test() +{ + document.write("SUCCESS (1 of 2)<script>document.open(); document.write('<br>SUCCESS (2 of 2)<br>');</scr" + "ipt>"); +} +</script> +</body> |