Skip to content

GitLab

T
tangled
Commit 23646342 authored by aroben's avatar aroben
Browse files
Options

LayoutTests: 

        Reviewed by Anders.

        Fix: http://bugs.webkit.org/show_bug.cgi?id=12288
        fast/tokenizer/004 needs new results

        * fast/tokenizer/004.html: Changed to dump as text, changed tabs to
        spaces.
        * fast/tokenizer/004-expected.txt: Updated results.
        * fast/tokenizer/004-expected.checksum: Removed.
        * fast/tokenizer/004-expected.png: Removed.

WebCore:

        Reviewed by Anders.

        Fix comment.

        * html/HTMLScriptElement.cpp:
        (WebCore::HTMLScriptElement::shouldExecuteAsJavaScript):



git-svn-id: svn://svn.chromium.org/blink/trunk@18867 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent bdeab577
Expand all Show whitespace changes
Inline Side-by-side
Showing with 354 additions and 874 deletions
third_party/WebKit/LayoutTests/ChangeLog
View file @ 23646342
2007-01-15 Adam Roben <aroben@apple.com>
Reviewed by Anders.
Fix: http://bugs.webkit.org/show_bug.cgi?id=12288
fast/tokenizer/004 needs new results
* fast/tokenizer/004.html: Changed to dump as text, changed tabs to
spaces.
* fast/tokenizer/004-expected.txt: Updated results.
* fast/tokenizer/004-expected.checksum: Removed.
* fast/tokenizer/004-expected.png: Removed.
2007-01-15 Mitz Pettel <mitz@webkit.org> 2007-01-15 Mitz Pettel <mitz@webkit.org>
Reviewed by Darin. Reviewed by Darin.
third_party/WebKit/LayoutTests/fast/tokenizer/004-expected.checksum deleted 100644 → 0
View file @ bdeab577
2faae95bdd66d5dd893d670eb98ef7d4
\ No newline at end of file
third_party/WebKit/LayoutTests/fast/tokenizer/004.html
View file @ 23646342
<html> <html>
<script>
if (window.layoutTestController)
layoutTestController.dumpAsText();
</script>
<body> <body>
<h3>Variations on type attribute of script tag</h3> <h3>Variations on type attribute of script tag</h3>
<h4>These scripts should execute</h4> <h4>These scripts should execute</h4>
...@@ -13,12 +17,11 @@ ...@@ -13,12 +17,11 @@
<li>text/jscript <script type="text/jscript">document.write("executed");</script></li> <li>text/jscript <script type="text/jscript">document.write("executed");</script></li>
<li>text/ecmascript <script type="text/ecmascript">document.write("executed");</script></li> <li>text/ecmascript <script type="text/ecmascript">document.write("executed");</script></li>
<li>text/livescript <script type="text/livescript">document.write("executed");</script></li> <li>text/livescript <script type="text/livescript">document.write("executed");</script></li>
<li>text/javascript1.0 <script type="text/javascript1.0">document.write("executed");</script></li>
<li>text/javascript1.1 <script type="text/javascript1.1">document.write("executed");</script></li> <li>text/javascript1.1 <script type="text/javascript1.1">document.write("executed");</script></li>
<li>text/javascript1.2 <script type="text/javascript1.2">document.write("executed");</script></li> <li>text/javascript1.2 <script type="text/javascript1.2">document.write("executed");</script></li>
<li>text/javascript1.3 <script type="text/javascript1.3">document.write("executed");</script></li> <li>text/javascript1.3 <script type="text/javascript1.3">document.write("executed");</script></li>
<li>text/javascript1.4 <script type="text/javascript1.4">document.write("executed");</script></li> <li>application/javascript <script type="application/javascript">document.write("executed");</script></li>
<li>text/javascript1.5 <script type="text/javascript1.5">document.write("executed");</script></li> <li>application/ecmascript <script type="application/ecmascript">document.write("executed");</script></li>
<li>application/x-javascript <script type="application/x-javascript">document.write("executed");</script></li> <li>application/x-javascript <script type="application/x-javascript">document.write("executed");</script></li>
</ol> </ol>
<h4>These scripts should not execute</h4> <h4>These scripts should not execute</h4>
...@@ -29,14 +32,15 @@ ...@@ -29,14 +32,15 @@
<li>text/vbs <script type="text/vbs">document.write("executed");</script></li> <li>text/vbs <script type="text/vbs">document.write("executed");</script></li>
<li>text/xml <script type="text/xml">document.write("executed");</script></li> <li>text/xml <script type="text/xml">document.write("executed");</script></li>
<li>text/javascript1 <script type="text/javascript1">document.write("executed");</script></li> <li>text/javascript1 <script type="text/javascript1">document.write("executed");</script></li>
<li>text/javascript1.0 <script type="text/javascript1.0">document.write("executed");</script></li>
<li>text/javascript1.4 <script type="text/javascript1.4">document.write("executed");</script></li>
<li>text/javascript1.5 <script type="text/javascript1.5">document.write("executed");</script></li>
<li>text/javascript1.6 <script type="text/javascript1.6">document.write("executed");</script></li> <li>text/javascript1.6 <script type="text/javascript1.6">document.write("executed");</script></li>
<li>application/jscript <script type="application/jscript">document.write("executed");</script></li> <li>application/jscript <script type="application/jscript">document.write("executed");</script></li>
<li>application/x-jscript <script type="application/x-jscript">document.write("executed");</script></li> <li>application/x-jscript <script type="application/x-jscript">document.write("executed");</script></li>
<li>application/livescript <script type="application/livescript">document.write("executed");</script></li> <li>application/livescript <script type="application/livescript">document.write("executed");</script></li>
<li>application/x-livescript <script type="application/x-livescript">document.write("executed");</script></li> <li>application/x-livescript <script type="application/x-livescript">document.write("executed");</script></li>
<li>application/ecmascript <script type="application/ecmascript">document.write("executed");</script></li>
<li>application/x-ecmascript <script type="application/x-ecmascript">document.write("executed");</script></li> <li>application/x-ecmascript <script type="application/x-ecmascript">document.write("executed");</script></li>
<li>application/javascript <script type="application/javascript">document.write("executed");</script></li>
<li>application/javascript1.2 <script type="application/javascript1.2">document.write("executed");</script></li> <li>application/javascript1.2 <script type="application/javascript1.2">document.write("executed");</script></li>
<li>application/x-javascript1.2 <script type="application/x-javascript1.2">document.write("executed");</script></li> <li>application/x-javascript1.2 <script type="application/x-javascript1.2">document.write("executed");</script></li>
<li>javascript <script type="javascript">document.write("executed");</script></li> <li>javascript <script type="javascript">document.write("executed");</script></li>
...@@ -111,6 +115,8 @@ ...@@ -111,6 +115,8 @@
<li>JavaScript1.3 <script language="JavaScript1.3">document.write("executed");</script></li> <li>JavaScript1.3 <script language="JavaScript1.3">document.write("executed");</script></li>
<li>JavaScript1.4 <script language="JavaScript1.4">document.write("executed");</script></li> <li>JavaScript1.4 <script language="JavaScript1.4">document.write("executed");</script></li>
<li>JavaScript1.5 <script language="JavaScript1.5">document.write("executed");</script></li> <li>JavaScript1.5 <script language="JavaScript1.5">document.write("executed");</script></li>
<li>JavaScript1.6 <script language="JavaScript1.6">document.write("executed");</script></li>
<li>JavaScript1.7 <script language="JavaScript1.7">document.write("executed");</script></li>
</ol> </ol>
<h4>These scripts should not execute</h4> <h4>These scripts should not execute</h4>
<ol> <ol>
...@@ -138,8 +144,8 @@ ...@@ -138,8 +144,8 @@
<li>javascript_1.0 <script language="javascript_1.0">document.write("executed");</script></li> <li>javascript_1.0 <script language="javascript_1.0">document.write("executed");</script></li>
<li>javascript 1.0 x <script language="javascript 1.0 x">document.write("executed");</script></li> <li>javascript 1.0 x <script language="javascript 1.0 x">document.write("executed");</script></li>
<li>JavaScript1 <script language="JavaScript1">document.write("executed");</script></li> <li>JavaScript1 <script language="JavaScript1">document.write("executed");</script></li>
<li>JavaScript1.6 <script language="JavaScript1.6">document.write("executed");</script></li> <li>JavaScript1.8 <script language="JavaScript1.8">document.write("executed");</script></li>
<li>JavaScript1.7 <script language="JavaScript1.7">document.write("executed");</script></li> <li>JavaScript1.9 <script language="JavaScript1.9">document.write("executed");</script></li>
<li>JavaScript1.4.1 <script language="JavaScript1.4.1">document.write("executed");</script></li> <li>JavaScript1.4.1 <script language="JavaScript1.4.1">document.write("executed");</script></li>
<li>1.0 javascript <script language="1.0 javascript">document.write("executed");</script></li> <li>1.0 javascript <script language="1.0 javascript">document.write("executed");</script></li>
<li>' javascript ' <script language=" javascript ">document.write("executed");</script></li> <li>' javascript ' <script language=" javascript ">document.write("executed");</script></li>
......
third_party/WebKit/WebCore/ChangeLog
View file @ 23646342
2007-01-15 Adam Roben <aroben@apple.com>
Reviewed by Anders.
Fix comment.
* html/HTMLScriptElement.cpp:
(WebCore::HTMLScriptElement::shouldExecuteAsJavaScript):
2007-01-15 John Sullivan <sullivan@apple.com> 2007-01-15 John Sullivan <sullivan@apple.com>
* platform/ContextMenu.cpp: * platform/ContextMenu.cpp:
......
third_party/WebKit/WebCore/html/HTMLScriptElement.cpp
View file @ 23646342
...@@ -185,7 +185,7 @@ bool HTMLScriptElement::shouldExecuteAsJavaScript() ...@@ -185,7 +185,7 @@ bool HTMLScriptElement::shouldExecuteAsJavaScript()
/* /*
Mozilla 1.8 accepts javascript1.0 - javascript1.7, but WinIE 7 accepts only javascript1.1 - javascript1.3. Mozilla 1.8 accepts javascript1.0 - javascript1.7, but WinIE 7 accepts only javascript1.1 - javascript1.3.
Mozilla 1.8 and WinIE 7 Mozilla 1.8 and WinIE 7 both accept javascript and livescript.
WinIE 7 accepts ecmascript and jscript, but Mozilla 1.8 doesn't. WinIE 7 accepts ecmascript and jscript, but Mozilla 1.8 doesn't.
Neither Mozilla 1.8 nor WinIE 7 accept leading or trailing whitespace. Neither Mozilla 1.8 nor WinIE 7 accept leading or trailing whitespace.
We want to accept all the values that either of these browsers accept, but not other values. We want to accept all the values that either of these browsers accept, but not other values.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment