Remove HTMLTokenTypes header (and split out AtomicHTMLToken.h from HTMLToken.h)
Created attachment 187733 [details] Patch
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.
Created attachment 187805 [details] Patch
Created attachment 187806 [details] Patch
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.
Comment on attachment 187806 [details] Patch Attachment 187806 [details] did not pass efl-ews (efl): Output: http://queues.webkit.org/results/16513059
Comment on attachment 187806 [details] Patch Attachment 187806 [details] did not pass qt-ews (qt): Output: http://queues.webkit.org/results/16521056
Comment on attachment 187806 [details] Patch Attachment 187806 [details] did not pass qt-wk2-ews (qt): Output: http://queues.webkit.org/results/16520049
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.
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
Created attachment 187889 [details] Should compile now
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.
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
Created attachment 187890 [details] Patch for landing
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.
Comment on attachment 187890 [details] Patch for landing Clearing flags on attachment: 187890 Committed r142641: <http://trac.webkit.org/changeset/142641>
All reviewed patches have been landed. Closing bug.
At lot of timeout right now on the bots. This patch could be the cause. Any idea?
(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.