Bug 109525

Summary:

Remove HTMLTokenTypes header (and split out AtomicHTMLToken.h from HTMLToken.h)

Product:

WebKit

Reporter:

Eric Seidel (no email) <eric>

Component:

New Bugs

Assignee:

Eric Seidel (no email) <eric>

Status:

RESOLVED FIXED

Severity:

Normal

CC:

abarth, alancutter, benjamin, dbates, dglazkov, mithro, ojan.autocc, rego+ews, tonyg, webkit-ews, webkit.review.bot, xan.lopez

Priority:

Version:

528+ (Nightly build)

Hardware:

Unspecified

OS:

Unspecified

Bug Depends on:

Bug Blocks:

107522

Attachments:

Description	Flags
Patch	none
Patch	none
Patch	none
Should compile now	none
Patch for landing	none

Eric Seidel (no email)

Reported 2013-02-11 17:14:34 PST

Remove HTMLTokenTypes header (and split out AtomicHTMLToken.h from HTMLToken.h)

Attachments
Patch (98.79 KB, patch) 2013-02-11 17:15 PST, Eric Seidel (no email)	no flags	Details Formatted Diff Diff
Patch (91.67 KB, patch) 2013-02-12 01:15 PST, Eric Seidel (no email)	no flags	Details Formatted Diff Diff
Patch (91.59 KB, patch) 2013-02-12 01:20 PST, Eric Seidel (no email)	no flags	Details Formatted Diff Diff
Should compile now (91.62 KB, patch) 2013-02-12 10:09 PST, Eric Seidel (no email)	no flags	Details Formatted Diff Diff
Patch for landing (91.99 KB, patch) 2013-02-12 10:16 PST, Eric Seidel (no email)	no flags	Details Formatted Diff Diff
Show Obsolete (4) View All Add attachment proposed patch, testcase, etc.

Eric Seidel (no email)

Comment 1 2013-02-11 17:15:52 PST

Created attachment 187733 [details] Patch

Adam Barth

Comment 2 2013-02-11 17:20:31 PST

Comment on attachment 187733 [details] Patch View in context: https://bugs.webkit.org/attachment.cgi?id=187733&action=review > Source/WebCore/html/parser/AtomicHTMLToken.h:179 > + default: > + break; We shouldn't need these default statements now that we've unwound the templates. > Source/WebCore/html/parser/AtomicHTMLToken.h:221 > + default: > + break; ditto > Source/WebCore/html/parser/HTMLDocumentParser.cpp:171 > +#if ENABLE(THREADED_HTML_PARSER) > // NOTE: This pump should only ever emit buffered character tokens, > // so ForceSynchronous vs. AllowYield should be meaningless. > -#if ENABLE(THREADED_HTML_PARSER) > - if (m_tokenizer) { > - ASSERT(!m_haveBackgroundParser); > - pumpTokenizerIfPossible(ForceSynchronous); > - } > -#else > - pumpTokenizerIfPossible(ForceSynchronous); > + if (!m_haveBackgroundParser) > #endif > + pumpTokenizerIfPossible(ForceSynchronous); This diff is spurious. > Source/WebCore/html/parser/HTMLDocumentParser.cpp:392 > - ASSERT(m_tokenizer); > - ASSERT(m_token); > + As is this > Source/WebCore/html/parser/HTMLToken.h:111 > + ASSERT(m_type == HTMLToken::Uninitialized); We shouldn't need the "HTMLToken::" prefix since we're inside this class.

Eric Seidel (no email)

Comment 3 2013-02-12 01:15:28 PST

Created attachment 187805 [details] Patch

Eric Seidel (no email)

Comment 4 2013-02-12 01:20:57 PST

Created attachment 187806 [details] Patch

WebKit Review Bot

Comment 5 2013-02-12 01:28:02 PST

Attachment 187806 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/GNUmakefile.list.am', u'Source/WebCore/Target.pri', u'Source/WebCore/WebCore.gypi', u'Source/WebCore/WebCore.vcproj/WebCore.vcproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/html/HTMLViewSourceDocument.cpp', u'Source/WebCore/html/parser/AtomicHTMLToken.h', u'Source/WebCore/html/parser/BackgroundHTMLParser.cpp', u'Source/WebCore/html/parser/CompactHTMLToken.cpp', u'Source/WebCore/html/parser/CompactHTMLToken.h', u'Source/WebCore/html/parser/HTMLConstructionSite.cpp', u'Source/WebCore/html/parser/HTMLDocumentParser.cpp', u'Source/WebCore/html/parser/HTMLDocumentParser.h', u'Source/WebCore/html/parser/HTMLMetaCharsetParser.cpp', u'Source/WebCore/html/parser/HTMLPreloadScanner.cpp', u'Source/WebCore/html/parser/HTMLSourceTracker.cpp', u'Source/WebCore/html/parser/HTMLStackItem.h', u'Source/WebCore/html/parser/HTMLToken.h', u'Source/WebCore/html/parser/HTMLTokenTypes.h', u'Source/WebCore/html/parser/HTMLTokenizer.cpp', u'Source/WebCore/html/parser/HTMLTokenizer.h', u'Source/WebCore/html/parser/HTMLTreeBuilder.cpp', u'Source/WebCore/html/parser/HTMLViewSourceParser.cpp', u'Source/WebCore/html/parser/TextDocumentParser.cpp', u'Source/WebCore/html/parser/XSSAuditor.cpp']" exit_code: 1 Source/WebCore/html/parser/HTMLConstructionSite.cpp:30: Alphabetical sorting problem. [build/include_order] [4] Source/WebCore/html/parser/HTMLToken.h:69: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 2 in 27 files If any of these errors are false positives, please file a bug against check-webkit-style.

EFL EWS Bot

Comment 6 2013-02-12 01:29:35 PST

Comment on attachment 187806 [details] Patch Attachment 187806 [details] did not pass efl-ews (efl): Output: http://queues.webkit.org/results/16513059

Early Warning System Bot

Comment 7 2013-02-12 01:31:24 PST

Comment on attachment 187806 [details] Patch Attachment 187806 [details] did not pass qt-ews (qt): Output: http://queues.webkit.org/results/16521056

Early Warning System Bot

Comment 8 2013-02-12 01:32:47 PST

Comment on attachment 187806 [details] Patch Attachment 187806 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/16520049

Eric Seidel (no email)

Comment 9 2013-02-12 01:38:48 PST

I'll fix the build with THREADED_HTML_PARSER disabled tomorrow. :( Sleep now. Also, the style errors seem to be bogus, and that message seems to be ridiculously long.

WebKit Review Bot

Comment 10 2013-02-12 01:48:18 PST

Comment on attachment 187806 [details] Patch Attachment 187806 [details] did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16513066

Eric Seidel (no email)

Comment 11 2013-02-12 10:09:18 PST

Created attachment 187889 [details] Should compile now

WebKit Review Bot

Comment 12 2013-02-12 10:11:25 PST

Attachment 187889 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/GNUmakefile.list.am', u'Source/WebCore/Target.pri', u'Source/WebCore/WebCore.gypi', u'Source/WebCore/WebCore.vcproj/WebCore.vcproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/html/HTMLViewSourceDocument.cpp', u'Source/WebCore/html/parser/AtomicHTMLToken.h', u'Source/WebCore/html/parser/BackgroundHTMLParser.cpp', u'Source/WebCore/html/parser/CompactHTMLToken.cpp', u'Source/WebCore/html/parser/CompactHTMLToken.h', u'Source/WebCore/html/parser/HTMLConstructionSite.cpp', u'Source/WebCore/html/parser/HTMLDocumentParser.cpp', u'Source/WebCore/html/parser/HTMLDocumentParser.h', u'Source/WebCore/html/parser/HTMLMetaCharsetParser.cpp', u'Source/WebCore/html/parser/HTMLPreloadScanner.cpp', u'Source/WebCore/html/parser/HTMLSourceTracker.cpp', u'Source/WebCore/html/parser/HTMLStackItem.h', u'Source/WebCore/html/parser/HTMLToken.h', u'Source/WebCore/html/parser/HTMLTokenTypes.h', u'Source/WebCore/html/parser/HTMLTokenizer.cpp', u'Source/WebCore/html/parser/HTMLTokenizer.h', u'Source/WebCore/html/parser/HTMLTreeBuilder.cpp', u'Source/WebCore/html/parser/HTMLViewSourceParser.cpp', u'Source/WebCore/html/parser/TextDocumentParser.cpp', u'Source/WebCore/html/parser/XSSAuditor.cpp']" exit_code: 1 Source/WebCore/html/parser/HTMLConstructionSite.cpp:30: Alphabetical sorting problem. [build/include_order] [4] Source/WebCore/html/parser/HTMLToken.h:69: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 2 in 27 files If any of these errors are false positives, please file a bug against check-webkit-style.

WebKit Review Bot

Comment 13 2013-02-12 10:14:25 PST

Comment on attachment 187889 [details] Should compile now Attachment 187889 [details] did not pass cr-linux-debug-ews (chromium-xvfb): Output: http://queues.webkit.org/results/16517292

Eric Seidel (no email)

Comment 14 2013-02-12 10:16:56 PST

Created attachment 187890 [details] Patch for landing

WebKit Review Bot

Comment 15 2013-02-12 10:18:53 PST

Attachment 187890 [details] did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Source/WebCore/ChangeLog', u'Source/WebCore/GNUmakefile.list.am', u'Source/WebCore/Target.pri', u'Source/WebCore/WebCore.gypi', u'Source/WebCore/WebCore.vcproj/WebCore.vcproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj', u'Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters', u'Source/WebCore/WebCore.xcodeproj/project.pbxproj', u'Source/WebCore/html/HTMLViewSourceDocument.cpp', u'Source/WebCore/html/parser/AtomicHTMLToken.h', u'Source/WebCore/html/parser/BackgroundHTMLParser.cpp', u'Source/WebCore/html/parser/CompactHTMLToken.cpp', u'Source/WebCore/html/parser/CompactHTMLToken.h', u'Source/WebCore/html/parser/HTMLConstructionSite.cpp', u'Source/WebCore/html/parser/HTMLDocumentParser.cpp', u'Source/WebCore/html/parser/HTMLDocumentParser.h', u'Source/WebCore/html/parser/HTMLMetaCharsetParser.cpp', u'Source/WebCore/html/parser/HTMLPreloadScanner.cpp', u'Source/WebCore/html/parser/HTMLSourceTracker.cpp', u'Source/WebCore/html/parser/HTMLStackItem.h', u'Source/WebCore/html/parser/HTMLToken.h', u'Source/WebCore/html/parser/HTMLTokenTypes.h', u'Source/WebCore/html/parser/HTMLTokenizer.cpp', u'Source/WebCore/html/parser/HTMLTokenizer.h', u'Source/WebCore/html/parser/HTMLTreeBuilder.cpp', u'Source/WebCore/html/parser/HTMLViewSourceParser.cpp', u'Source/WebCore/html/parser/TextDocumentParser.cpp', u'Source/WebCore/html/parser/XSSAuditor.cpp']" exit_code: 1 Source/WebCore/html/parser/HTMLConstructionSite.cpp:30: Alphabetical sorting problem. [build/include_order] [4] Source/WebCore/html/parser/HTMLToken.h:69: enum members should use InterCaps with an initial capital letter. [readability/enum_casing] [4] Total errors found: 2 in 27 files If any of these errors are false positives, please file a bug against check-webkit-style.

WebKit Review Bot

Comment 16 2013-02-12 10:44:55 PST

Comment on attachment 187890 [details] Patch for landing Clearing flags on attachment: 187890 Committed r142641: <http://trac.webkit.org/changeset/142641>

WebKit Review Bot

Comment 17 2013-02-12 10:45:00 PST

All reviewed patches have been landed. Closing bug.

Benjamin Poulain

Comment 18 2013-02-12 15:04:33 PST

At lot of timeout right now on the bots. This patch could be the cause. Any idea?

Benjamin Poulain

Comment 19 2013-02-12 15:15:44 PST

(In reply to comment #18) > At lot of timeout right now on the bots. This patch could be the cause. Any idea? Ignore me, wrong link.

Note You need to log in before you can comment on or make changes to this bug.