[webkit-changes] cvs commit:
WebCore/layout-tests/fast/tokenizer/resources empty_script.js
Adele
adele at opensource.apple.com
Fri Jun 17 13:00:12 PDT 2005
adele 05/06/17 13:00:11
Modified: . ChangeLog
khtml/html htmltokenizer.cpp
Added: layout-tests/fast/tokenizer
external-script-document-write_2-expected.txt
external-script-document-write_2.html
script_extra_close-expected.txt
script_extra_close.html script_quirk-expected.txt
script_quirk.html
layout-tests/fast/tokenizer/resources empty_script.js
Log:
Reviewed by Maciej.
- fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3419
<rdar://problem/4111752> REGRESSION (125-312/412): Safari doesn't display edmunds.com pages first time through
* khtml/html/htmltokenizer.cpp: (khtml::HTMLTokenizer::parseTag): set 'script' flag when
parsing <script src="foo" /> case. In this case, parseTag calls the scriptHandler function which expects
that flag to be set, and sets it back to false at the appropriate time.
Test cases added: These still don't test the cached script cases, but they're good regression
tests for the tokenizer. We'll have to come up with a good way to test the cached cases later.
* layout-tests/fast/tokenizer/external-script-document-write_2-expected.txt: Added.
* layout-tests/fast/tokenizer/external-script-document-write_2.html: Added.
* layout-tests/fast/tokenizer/resources/empty_script.js: Added.
* layout-tests/fast/tokenizer/script_extra_close-expected.txt: Added.
* layout-tests/fast/tokenizer/script_extra_close.html: Added.
* layout-tests/fast/tokenizer/script_quirk-expected.txt: Added.
* layout-tests/fast/tokenizer/script_quirk.html: Added.
Revision Changes Path
1.4272 +22 -0 WebCore/ChangeLog
Index: ChangeLog
===================================================================
RCS file: /cvs/root/WebCore/ChangeLog,v
retrieving revision 1.4271
retrieving revision 1.4272
diff -u -r1.4271 -r1.4272
--- ChangeLog 17 Jun 2005 18:50:25 -0000 1.4271
+++ ChangeLog 17 Jun 2005 20:00:06 -0000 1.4272
@@ -1,3 +1,25 @@
+2005-06-17 Adele Peterson <adele at apple.com>
+
+ Reviewed by Maciej.
+
+ - fixed http://bugzilla.opendarwin.org/show_bug.cgi?id=3419
+ <rdar://problem/4111752> REGRESSION (125-312/412): Safari doesn't display edmunds.com pages first time through
+
+ * khtml/html/htmltokenizer.cpp: (khtml::HTMLTokenizer::parseTag): set 'script' flag when
+ parsing <script src="foo" /> case. In this case, parseTag calls the scriptHandler function which expects
+ that flag to be set, and sets it back to false at the appropriate time.
+
+ Test cases added: These still don't test the cached script cases, but they're good regression
+ tests for the tokenizer. We'll have to come up with a good way to test the cached cases later.
+
+ * layout-tests/fast/tokenizer/external-script-document-write_2-expected.txt: Added.
+ * layout-tests/fast/tokenizer/external-script-document-write_2.html: Added.
+ * layout-tests/fast/tokenizer/resources/empty_script.js: Added.
+ * layout-tests/fast/tokenizer/script_extra_close-expected.txt: Added.
+ * layout-tests/fast/tokenizer/script_extra_close.html: Added.
+ * layout-tests/fast/tokenizer/script_quirk-expected.txt: Added.
+ * layout-tests/fast/tokenizer/script_quirk.html: Added.
+
2005-06-17 Justin Garcia <justin.garcia at apple.com>
Fixed fprintf problem in gcc4.0
1.93 +3 -1 WebCore/khtml/html/htmltokenizer.cpp
Index: htmltokenizer.cpp
===================================================================
RCS file: /cvs/root/WebCore/khtml/html/htmltokenizer.cpp,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- htmltokenizer.cpp 14 Jun 2005 22:36:30 -0000 1.92
+++ htmltokenizer.cpp 17 Jun 2005 20:00:10 -0000 1.93
@@ -1434,8 +1434,10 @@
script = true;
parseSpecial(src);
}
- else if (tagID <= ID_CLOSE_TAG) // Handle <script src="foo"/>
+ else if (tagID <= ID_CLOSE_TAG) { // Handle <script src="foo"/>
+ script = true;
scriptHandler();
+ }
break;
case ID_STYLE:
if (beginTag) {
1.1 WebCore/layout-tests/fast/tokenizer/external-script-document-write_2-expected.txt
Index: external-script-document-write_2-expected.txt
===================================================================
layer at (0,0) size 800x600
RenderCanvas 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
RenderText {TEXT} at (0,0) size 275x18
text run at (0,0) width 112: "TEST PASSED. "
text run at (112,0) width 163: "This text should show up."
RenderText {TEXT} at (0,0) size 0x0
1.1 WebCore/layout-tests/fast/tokenizer/external-script-document-write_2.html
Index: external-script-document-write_2.html
===================================================================
<html>
<body>
<script>
document.write('<scr'+'ipt src="resources/empty_script.js"></scr'+'ipt>');
</script>
<script src=""></script>
TEST PASSED. This text should show up.
</body>
</html>
1.1 WebCore/layout-tests/fast/tokenizer/script_extra_close-expected.txt
Index: script_extra_close-expected.txt
===================================================================
layer at (0,0) size 800x600
RenderCanvas 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
RenderText {TEXT} at (0,0) size 55x18
text run at (0,0) width 55: "TEST... "
RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (0,0) size 0x0
RenderText {TEXT} at (55,0) size 232x18
text run at (55,0) width 69: "PASSED. "
text run at (124,0) width 163: "This text should show up."
RenderText {TEXT} at (0,0) size 0x0
1.1 WebCore/layout-tests/fast/tokenizer/script_extra_close.html
Index: script_extra_close.html
===================================================================
<html>
<body>
TEST...
<script src="" />
</script>
<script src="resources/empty_script.js">
</script>
PASSED. This text should show up.
</body>
</html>
1.1 WebCore/layout-tests/fast/tokenizer/script_quirk-expected.txt
Index: script_quirk-expected.txt
===================================================================
layer at (0,0) size 800x600
RenderCanvas 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
RenderText {TEXT} at (0,0) size 275x18
text run at (0,0) width 112: "TEST PASSED. "
text run at (112,0) width 163: "This text should show up."
RenderText {TEXT} at (0,0) size 0x0
1.1 WebCore/layout-tests/fast/tokenizer/script_quirk.html
Index: script_quirk.html
===================================================================
<html>
<body>
<script src="resources/empty_script.js" />
TEST PASSED. This text should show up.
</body>
</html
1.1 WebCore/layout-tests/fast/tokenizer/resources/empty_script.js
<<Binary file>>
More information about the webkit-changes
mailing list