From 67d5193c1b71d5ae7fdd24f2e621c18d9faada98 Mon Sep 17 00:00:00 2001 From: "tonyg@chromium.org" Date: Sat, 26 Jun 2010 16:49:32 +0000 Subject: [PATCH] 2010-06-26 Tony Gentilcore Reviewed by Adam Barth. Add a document.write to script-line-number test to ensure its new lines are excluded. https://bugs.webkit.org/show_bug.cgi?id=41060 * fast/js/script-line-number-expected.txt: * fast/js/script-line-number.html: 2010-06-26 Tony Gentilcore Reviewed by Adam Barth. Exclude line numbers for sources which are not from the network. https://bugs.webkit.org/show_bug.cgi?id=41060 * html/HTMLDocumentParser.cpp: (WebCore::HTMLDocumentParser::write): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@61956 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- LayoutTests/ChangeLog | 10 + .../fast/js/script-line-number-expected.txt | 4 +- LayoutTests/fast/js/script-line-number.html | 12 +- LayoutTests/html5lib/runner-expected.txt | 4 +- .../html5lib/webkit-resumer-expected.txt | 316 +++++++++--------- WebCore/ChangeLog | 10 + WebCore/html/HTMLDocumentParser.cpp | 5 +- 7 files changed, 195 insertions(+), 166 deletions(-) diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog index f99f37079d43..3b2dc66a77b6 100644 --- a/LayoutTests/ChangeLog +++ b/LayoutTests/ChangeLog @@ -1,3 +1,13 @@ +2010-06-26 Tony Gentilcore + + Reviewed by Adam Barth. + + Add a document.write to script-line-number test to ensure its new lines are excluded. + https://bugs.webkit.org/show_bug.cgi?id=41060 + + * fast/js/script-line-number-expected.txt: + * fast/js/script-line-number.html: + 2010-06-26 Robert Hogan Reviewed by Kenneth Rohde Christiansen. diff --git a/LayoutTests/fast/js/script-line-number-expected.txt b/LayoutTests/fast/js/script-line-number-expected.txt index f1db5f5dab9b..ea4dc4899795 100644 --- a/LayoutTests/fast/js/script-line-number-expected.txt +++ b/LayoutTests/fast/js/script-line-number-expected.txt @@ -3,8 +3,8 @@ This test checks that line numbers are correctly reported for both inline script On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE". -PASS 10 is 10 -PASS 13 is 13 +PASS 16 is 16 +PASS 19 is 19 PASS successfullyParsed is true TEST COMPLETE diff --git a/LayoutTests/fast/js/script-line-number.html b/LayoutTests/fast/js/script-line-number.html index 3c565e08ce37..2f1228f4784a 100644 --- a/LayoutTests/fast/js/script-line-number.html +++ b/LayoutTests/fast/js/script-line-number.html @@ -7,12 +7,18 @@

- + + + + + diff --git a/LayoutTests/html5lib/runner-expected.txt b/LayoutTests/html5lib/runner-expected.txt index cb1daf84f0b1..e56a5699ed79 100644 --- a/LayoutTests/html5lib/runner-expected.txt +++ b/LayoutTests/html5lib/runner-expected.txt @@ -1,7 +1,7 @@ CONSOLE MESSAGE: line 1: SyntaxError: Parse error CONSOLE MESSAGE: line 1: SyntaxError: Parse error -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: FOOBARBAZ +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: FOOBARBAZ resources/tests1.dat: 25 29 diff --git a/LayoutTests/html5lib/webkit-resumer-expected.txt b/LayoutTests/html5lib/webkit-resumer-expected.txt index 8535e87f38de..8d889c7bde39 100644 --- a/LayoutTests/html5lib/webkit-resumer-expected.txt +++ b/LayoutTests/html5lib/webkit-resumer-expected.txt @@ -1,161 +1,161 @@ -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: PASS -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ -CONSOLE MESSAGE: line 3: FOOBARBAZ +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: PASS +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ +CONSOLE MESSAGE: line 2: FOOBARBAZ resources/webkit01.dat: 519.3 520.4 diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog index 0ddbb481f384..2dbe55d804a5 100644 --- a/WebCore/ChangeLog +++ b/WebCore/ChangeLog @@ -1,3 +1,13 @@ +2010-06-26 Tony Gentilcore + + Reviewed by Adam Barth. + + Exclude line numbers for sources which are not from the network. + https://bugs.webkit.org/show_bug.cgi?id=41060 + + * html/HTMLDocumentParser.cpp: + (WebCore::HTMLDocumentParser::write): + 2010-06-25 Antonio Gomes Unreviewed complementary fix for r61818. It added StaticHashSetListNode.cpp|h to the system, diff --git a/WebCore/html/HTMLDocumentParser.cpp b/WebCore/html/HTMLDocumentParser.cpp index 9ce22abc6125..fe110046b8e0 100644 --- a/WebCore/html/HTMLDocumentParser.cpp +++ b/WebCore/html/HTMLDocumentParser.cpp @@ -219,7 +219,10 @@ void HTMLDocumentParser::insert(const SegmentedString& source) return; NestingLevelIncrementer nestingLevelIncrementer(m_writeNestingLevel); - m_input.insertAtCurrentInsertionPoint(source); + + SegmentedString excludedLineNumberSource(source); + excludedLineNumberSource.setExcludeLineNumbers(); + m_input.insertAtCurrentInsertionPoint(excludedLineNumberSource); pumpTokenizerIfPossible(ForceSynchronous); endIfDelayed(); } -- 2.36.0