From 927c386dd8c9526d8695d0202a08735984dc7b31 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Thu, 16 Jan 2020 07:28:40 -0500 Subject: Regenerate nsHtml5*.cpp files from java htmlparser sources --- parser/html/nsHtml5AttributeName.cpp | 3 ++- parser/html/nsHtml5AttributeName.h | 3 ++- parser/html/nsHtml5ElementName.cpp | 29 ++++++++++----------- parser/html/nsHtml5ElementName.h | 29 ++++++++++----------- parser/html/nsHtml5HtmlAttributes.cpp | 20 +++++++-------- parser/html/nsHtml5HtmlAttributes.h | 9 +++---- parser/html/nsHtml5MetaScanner.cpp | 6 ++--- parser/html/nsHtml5MetaScanner.h | 3 ++- parser/html/nsHtml5Portability.h | 23 ++++++----------- parser/html/nsHtml5StackNode.cpp | 3 ++- parser/html/nsHtml5StackNode.h | 3 ++- parser/html/nsHtml5StateSnapshot.cpp | 3 ++- parser/html/nsHtml5StateSnapshot.h | 3 ++- parser/html/nsHtml5Tokenizer.cpp | 11 ++++---- parser/html/nsHtml5Tokenizer.h | 3 ++- parser/html/nsHtml5TreeBuilder.cpp | 47 ++++++++++------------------------- parser/html/nsHtml5TreeBuilder.h | 28 ++++++--------------- parser/html/nsHtml5UTF16Buffer.cpp | 3 ++- parser/html/nsHtml5UTF16Buffer.h | 3 ++- 19 files changed, 100 insertions(+), 132 deletions(-) diff --git a/parser/html/nsHtml5AttributeName.cpp b/parser/html/nsHtml5AttributeName.cpp index 8c7db5689..7e1cb7dd0 100644 --- a/parser/html/nsHtml5AttributeName.cpp +++ b/parser/html/nsHtml5AttributeName.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2008-2011 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/parser/html/nsHtml5AttributeName.h b/parser/html/nsHtml5AttributeName.h index 9d00e2da0..e12fb35cc 100644 --- a/parser/html/nsHtml5AttributeName.h +++ b/parser/html/nsHtml5AttributeName.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2008-2011 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/parser/html/nsHtml5ElementName.cpp b/parser/html/nsHtml5ElementName.cpp index dd2fe0247..f997f4781 100644 --- a/parser/html/nsHtml5ElementName.cpp +++ b/parser/html/nsHtml5ElementName.cpp @@ -1,23 +1,24 @@ /* - * Copyright (c) 2008-2014 Mozilla Foundation - * Copyright (c) 2020 Moonchild Productions + * Copyright (c) 2008-2016 Mozilla Foundation + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included in + * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ diff --git a/parser/html/nsHtml5ElementName.h b/parser/html/nsHtml5ElementName.h index f6ce7bcae..99c6de323 100644 --- a/parser/html/nsHtml5ElementName.h +++ b/parser/html/nsHtml5ElementName.h @@ -1,23 +1,24 @@ /* - * Copyright (c) 2008-2014 Mozilla Foundation - * Copyright (c) 2020 Moonchild Productions + * Copyright (c) 2008-2016 Mozilla Foundation + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * - * Permission is hereby granted, free of charge, to any person obtaining a - * copy of this software and associated documentation files (the "Software"), - * to deal in the Software without restriction, including without limitation - * the rights to use, copy, modify, merge, publish, distribute, sublicense, - * and/or sell copies of the Software, and to permit persons to whom the + * Permission is hereby granted, free of charge, to any person obtaining a + * copy of this software and associated documentation files (the "Software"), + * to deal in the Software without restriction, including without limitation + * the rights to use, copy, modify, merge, publish, distribute, sublicense, + * and/or sell copies of the Software, and to permit persons to whom the * Software is furnished to do so, subject to the following conditions: * - * The above copyright notice and this permission notice shall be included in + * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL - * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL + * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. */ diff --git a/parser/html/nsHtml5HtmlAttributes.cpp b/parser/html/nsHtml5HtmlAttributes.cpp index 132d33da1..1460b5ca0 100644 --- a/parser/html/nsHtml5HtmlAttributes.cpp +++ b/parser/html/nsHtml5HtmlAttributes.cpp @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2008-2011 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -59,11 +60,11 @@ nsHtml5HtmlAttributes* nsHtml5HtmlAttributes::EMPTY_ATTRIBUTES = nullptr; nsHtml5HtmlAttributes::nsHtml5HtmlAttributes(int32_t mode) - : mode(mode) - , length(0) - , names(jArray::newJArray(8)) - , values(jArray::newJArray(8)) - , lines(jArray::newJArray(8)) + : mode(mode), + length(0), + names(jArray::newJArray(8)), + values(jArray::newJArray(8)), + lines(jArray::newJArray(8)) { MOZ_COUNT_CTOR(nsHtml5HtmlAttributes); } @@ -146,17 +147,14 @@ nsHtml5HtmlAttributes::getLineNoBoundsCheck(int32_t index) } void -nsHtml5HtmlAttributes::addAttribute(nsHtml5AttributeName* name, - nsHtml5String value, - int32_t line) +nsHtml5HtmlAttributes::addAttribute(nsHtml5AttributeName* name, nsHtml5String value, int32_t line) { if (names.length == length) { int32_t newLen = length << 1; jArray newNames = jArray::newJArray(newLen); nsHtml5ArrayCopy::arraycopy(names, newNames, names.length); names = newNames; - jArray newValues = - jArray::newJArray(newLen); + jArray newValues = jArray::newJArray(newLen); nsHtml5ArrayCopy::arraycopy(values, newValues, values.length); values = newValues; jArray newLines = jArray::newJArray(newLen); diff --git a/parser/html/nsHtml5HtmlAttributes.h b/parser/html/nsHtml5HtmlAttributes.h index ba3992788..f97e80c8a 100644 --- a/parser/html/nsHtml5HtmlAttributes.h +++ b/parser/html/nsHtml5HtmlAttributes.h @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2008-2011 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -65,7 +66,7 @@ class nsHtml5HtmlAttributes int32_t mode; int32_t length; autoJArray names; - autoJArray values; + autoJArray values; autoJArray lines; public: explicit nsHtml5HtmlAttributes(int32_t mode); @@ -79,9 +80,7 @@ class nsHtml5HtmlAttributes nsHtml5String getValueNoBoundsCheck(int32_t index); nsHtml5AttributeName* getAttributeNameNoBoundsCheck(int32_t index); int32_t getLineNoBoundsCheck(int32_t index); - void addAttribute(nsHtml5AttributeName* name, - nsHtml5String value, - int32_t line); + void addAttribute(nsHtml5AttributeName* name, nsHtml5String value, int32_t line); void clear(int32_t m); void releaseValue(int32_t i); void clearWithoutReleasingContents(); diff --git a/parser/html/nsHtml5MetaScanner.cpp b/parser/html/nsHtml5MetaScanner.cpp index 3449026f1..f22b77f0d 100644 --- a/parser/html/nsHtml5MetaScanner.cpp +++ b/parser/html/nsHtml5MetaScanner.cpp @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2008-2015 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -787,8 +788,7 @@ nsHtml5MetaScanner::handleTagInner() return true; } if (!!content && httpEquivState == NS_HTML5META_SCANNER_HTTP_EQUIV_CONTENT_TYPE) { - nsHtml5String extract = - nsHtml5TreeBuilder::extractCharsetFromContent(content, treeBuilder); + nsHtml5String extract = nsHtml5TreeBuilder::extractCharsetFromContent(content, treeBuilder); if (!extract) { return false; } diff --git a/parser/html/nsHtml5MetaScanner.h b/parser/html/nsHtml5MetaScanner.h index 08a771860..7fb950d2c 100644 --- a/parser/html/nsHtml5MetaScanner.h +++ b/parser/html/nsHtml5MetaScanner.h @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2008-2015 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/parser/html/nsHtml5Portability.h b/parser/html/nsHtml5Portability.h index 17004fb5d..ce9401664 100644 --- a/parser/html/nsHtml5Portability.h +++ b/parser/html/nsHtml5Portability.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2008-2015 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), @@ -60,24 +61,16 @@ class nsHtml5Portability { public: static nsIAtom* newLocalNameFromBuffer(char16_t* buf, int32_t offset, int32_t length, nsHtml5AtomTable* interner); - static nsHtml5String newStringFromBuffer(char16_t* buf, - int32_t offset, - int32_t length, - nsHtml5TreeBuilder* treeBuilder); + static nsHtml5String newStringFromBuffer(char16_t* buf, int32_t offset, int32_t length, nsHtml5TreeBuilder* treeBuilder); static nsHtml5String newEmptyString(); - static nsHtml5String newStringFromLiteral(const char* literal); - static nsHtml5String newStringFromString(nsHtml5String string); + static nsHtml5String newStringFromLiteral(const char* literal); + static nsHtml5String newStringFromString(nsHtml5String string); static jArray newCharArrayFromLocal(nsIAtom* local); - static jArray newCharArrayFromString( - nsHtml5String string); + static jArray newCharArrayFromString(nsHtml5String string); static nsIAtom* newLocalFromLocal(nsIAtom* local, nsHtml5AtomTable* interner); static bool localEqualsBuffer(nsIAtom* local, char16_t* buf, int32_t offset, int32_t length); - static bool lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString( - const char* lowerCaseLiteral, - nsHtml5String string); - static bool lowerCaseLiteralEqualsIgnoreAsciiCaseString( - const char* lowerCaseLiteral, - nsHtml5String string); + static bool lowerCaseLiteralIsPrefixOfIgnoreAsciiCaseString(const char* lowerCaseLiteral, nsHtml5String string); + static bool lowerCaseLiteralEqualsIgnoreAsciiCaseString(const char* lowerCaseLiteral, nsHtml5String string); static bool literalEqualsString(const char* literal, nsHtml5String string); static bool stringEqualsString(nsHtml5String one, nsHtml5String other); static void initializeStatics(); diff --git a/parser/html/nsHtml5StackNode.cpp b/parser/html/nsHtml5StackNode.cpp index f38510f4c..a29fb85d4 100644 --- a/parser/html/nsHtml5StackNode.cpp +++ b/parser/html/nsHtml5StackNode.cpp @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2007-2011 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/parser/html/nsHtml5StackNode.h b/parser/html/nsHtml5StackNode.h index 1f39cd0b5..cfe6820c6 100644 --- a/parser/html/nsHtml5StackNode.h +++ b/parser/html/nsHtml5StackNode.h @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2007-2011 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/parser/html/nsHtml5StateSnapshot.cpp b/parser/html/nsHtml5StateSnapshot.cpp index 2c2b0ec41..33809dc70 100644 --- a/parser/html/nsHtml5StateSnapshot.cpp +++ b/parser/html/nsHtml5StateSnapshot.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2009-2010 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/parser/html/nsHtml5StateSnapshot.h b/parser/html/nsHtml5StateSnapshot.h index 3594c8cd6..7d60b88c8 100644 --- a/parser/html/nsHtml5StateSnapshot.h +++ b/parser/html/nsHtml5StateSnapshot.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2009-2010 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/parser/html/nsHtml5Tokenizer.cpp b/parser/html/nsHtml5Tokenizer.cpp index fe1b47ad8..73c6d986f 100644 --- a/parser/html/nsHtml5Tokenizer.cpp +++ b/parser/html/nsHtml5Tokenizer.cpp @@ -1,7 +1,8 @@ /* * Copyright (c) 2005-2007 Henri Sivonen * Copyright (c) 2007-2015 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * Portions of comments Copyright 2004-2010 Apple Computer, Inc., Mozilla * Foundation, and Opera Software ASA. * @@ -114,8 +115,7 @@ nsHtml5Tokenizer::setInterner(nsHtml5AtomTable* interner) } void -nsHtml5Tokenizer::initLocation(nsHtml5String newPublicId, - nsHtml5String newSystemId) +nsHtml5Tokenizer::initLocation(nsHtml5String newPublicId, nsHtml5String newSystemId) { this->systemId = newSystemId; this->publicId = newPublicId; @@ -220,11 +220,10 @@ nsHtml5Tokenizer::emitOrAppendCharRefBuf(int32_t returnState) } } -nsHtml5String +nsHtml5String nsHtml5Tokenizer::strBufToString() { - nsHtml5String str = - nsHtml5Portability::newStringFromBuffer(strBuf, 0, strBufLen, tokenHandler); + nsHtml5String str = nsHtml5Portability::newStringFromBuffer(strBuf, 0, strBufLen, tokenHandler); clearStrBufAfterUse(); return str; } diff --git a/parser/html/nsHtml5Tokenizer.h b/parser/html/nsHtml5Tokenizer.h index 11a9bab1b..101cd1618 100644 --- a/parser/html/nsHtml5Tokenizer.h +++ b/parser/html/nsHtml5Tokenizer.h @@ -1,7 +1,8 @@ /* * Copyright (c) 2005-2007 Henri Sivonen * Copyright (c) 2007-2015 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * Portions of comments Copyright 2004-2010 Apple Computer, Inc., Mozilla * Foundation, and Opera Software ASA. * diff --git a/parser/html/nsHtml5TreeBuilder.cpp b/parser/html/nsHtml5TreeBuilder.cpp index ec84c391e..cea78839c 100644 --- a/parser/html/nsHtml5TreeBuilder.cpp +++ b/parser/html/nsHtml5TreeBuilder.cpp @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2007-2015 Mozilla Foundation - * Copyright (c) 2020 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * Portions of comments Copyright 2004-2008 Apple Computer, Inc., Mozilla * Foundation, and Opera Software ASA. * @@ -131,12 +132,7 @@ nsHtml5TreeBuilder::startTokenization(nsHtml5Tokenizer* self) formPointer = getFormPointerForContext(contextNode); if (nsHtml5Atoms::title == contextName || nsHtml5Atoms::textarea == contextName) { tokenizer->setState(NS_HTML5TOKENIZER_RCDATA); - } else if (nsHtml5Atoms::style == contextName || - nsHtml5Atoms::xmp == contextName || - nsHtml5Atoms::iframe == contextName || - nsHtml5Atoms::noembed == contextName || - nsHtml5Atoms::noframes == contextName || - (scriptingEnabled && nsHtml5Atoms::noscript == contextName)) { + } else if (nsHtml5Atoms::style == contextName || nsHtml5Atoms::xmp == contextName || nsHtml5Atoms::iframe == contextName || nsHtml5Atoms::noembed == contextName || nsHtml5Atoms::noframes == contextName || (scriptingEnabled && nsHtml5Atoms::noscript == contextName)) { tokenizer->setState(NS_HTML5TOKENIZER_RAWTEXT); } else if (nsHtml5Atoms::plaintext == contextName) { tokenizer->setState(NS_HTML5TOKENIZER_PLAINTEXT); @@ -160,10 +156,7 @@ nsHtml5TreeBuilder::startTokenization(nsHtml5Tokenizer* self) } void -nsHtml5TreeBuilder::doctype(nsIAtom* name, - nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier, - bool forceQuirks) +nsHtml5TreeBuilder::doctype(nsIAtom* name, nsHtml5String publicIdentifier, nsHtml5String systemIdentifier, bool forceQuirks) { needToDropLF = false; if (!isInForeign() && mode == NS_HTML5TREE_BUILDER_INITIAL) { @@ -2000,8 +1993,7 @@ nsHtml5TreeBuilder::isSpecialParentInForeign(nsHtml5StackNode* stackNode) } nsHtml5String -nsHtml5TreeBuilder::extractCharsetFromContent(nsHtml5String attributeValue, - nsHtml5TreeBuilder* tb) +nsHtml5TreeBuilder::extractCharsetFromContent(nsHtml5String attributeValue, nsHtml5TreeBuilder* tb) { int32_t charsetState = NS_HTML5TREE_BUILDER_CHARSET_INITIAL; int32_t start = -1; @@ -2190,8 +2182,7 @@ nsHtml5TreeBuilder::extractCharsetFromContent(nsHtml5String attributeValue, if (end == -1) { end = buffer.length; } - charset = - nsHtml5Portability::newStringFromBuffer(buffer, start, end - start, tb); + charset = nsHtml5Portability::newStringFromBuffer(buffer, start, end - start, tb); } return charset; } @@ -2199,8 +2190,7 @@ nsHtml5TreeBuilder::extractCharsetFromContent(nsHtml5String attributeValue, void nsHtml5TreeBuilder::checkMetaCharset(nsHtml5HtmlAttributes* attributes) { - nsHtml5String charset = - attributes->getValue(nsHtml5AttributeName::ATTR_CHARSET); + nsHtml5String charset = attributes->getValue(nsHtml5AttributeName::ATTR_CHARSET); if (charset) { if (tokenizer->internalEncodingDeclaration(charset)) { requestSuspension(); @@ -2211,11 +2201,9 @@ nsHtml5TreeBuilder::checkMetaCharset(nsHtml5HtmlAttributes* attributes) if (!nsHtml5Portability::lowerCaseLiteralEqualsIgnoreAsciiCaseString("content-type", attributes->getValue(nsHtml5AttributeName::ATTR_HTTP_EQUIV))) { return; } - nsHtml5String content = - attributes->getValue(nsHtml5AttributeName::ATTR_CONTENT); + nsHtml5String content = attributes->getValue(nsHtml5AttributeName::ATTR_CONTENT); if (content) { - nsHtml5String extract = - nsHtml5TreeBuilder::extractCharsetFromContent(content, this); + nsHtml5String extract = nsHtml5TreeBuilder::extractCharsetFromContent(content, this); if (extract) { if (tokenizer->internalEncodingDeclaration(extract)) { requestSuspension(); @@ -3222,11 +3210,7 @@ nsHtml5TreeBuilder::isSecondOnStackBody() } void -nsHtml5TreeBuilder::documentModeInternal( - nsHtml5DocumentMode m, - nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier, - bool html4SpecificAdditionalErrorChecks) +nsHtml5TreeBuilder::documentModeInternal(nsHtml5DocumentMode m, nsHtml5String publicIdentifier, nsHtml5String systemIdentifier, bool html4SpecificAdditionalErrorChecks) { if (isSrcdocDocument) { quirks = false; @@ -3238,8 +3222,7 @@ nsHtml5TreeBuilder::documentModeInternal( } bool -nsHtml5TreeBuilder::isAlmostStandards(nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier) +nsHtml5TreeBuilder::isAlmostStandards(nsHtml5String publicIdentifier, nsHtml5String systemIdentifier) { if (nsHtml5Portability::lowerCaseLiteralEqualsIgnoreAsciiCaseString("-//w3c//dtd xhtml 1.0 transitional//en", publicIdentifier)) { return true; @@ -3259,10 +3242,7 @@ nsHtml5TreeBuilder::isAlmostStandards(nsHtml5String publicIdentifier, } bool -nsHtml5TreeBuilder::isQuirky(nsIAtom* name, - nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier, - bool forceQuirks) +nsHtml5TreeBuilder::isQuirky(nsIAtom* name, nsHtml5String publicIdentifier, nsHtml5String systemIdentifier, bool forceQuirks) { if (forceQuirks) { return true; @@ -4073,8 +4053,7 @@ nsHtml5TreeBuilder::appendToCurrentNodeAndPushElementMayFosterMathML(nsHtml5Elem bool nsHtml5TreeBuilder::annotationXmlEncodingPermitsHtml(nsHtml5HtmlAttributes* attributes) { - nsHtml5String encoding = - attributes->getValue(nsHtml5AttributeName::ATTR_ENCODING); + nsHtml5String encoding = attributes->getValue(nsHtml5AttributeName::ATTR_ENCODING); if (!encoding) { return false; } diff --git a/parser/html/nsHtml5TreeBuilder.h b/parser/html/nsHtml5TreeBuilder.h index fe9dc20bf..ff6cdd4ae 100644 --- a/parser/html/nsHtml5TreeBuilder.h +++ b/parser/html/nsHtml5TreeBuilder.h @@ -1,7 +1,8 @@ /* * Copyright (c) 2007 Henri Sivonen * Copyright (c) 2007-2015 Mozilla Foundation - * Copyright (c) 2020 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * Portions of comments Copyright 2004-2008 Apple Computer, Inc., Mozilla * Foundation, and Opera Software ASA. * @@ -104,10 +105,7 @@ class nsHtml5TreeBuilder : public nsAHtml5TreeBuilderState bool isSrcdocDocument; public: void startTokenization(nsHtml5Tokenizer* self); - void doctype(nsIAtom* name, - nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier, - bool forceQuirks); + void doctype(nsIAtom* name, nsHtml5String publicIdentifier, nsHtml5String systemIdentifier, bool forceQuirks); void comment(char16_t* buf, int32_t start, int32_t length); void characters(const char16_t* buf, int32_t start, int32_t length); void zeroOriginatingReplacementCharacter(); @@ -123,8 +121,7 @@ class nsHtml5TreeBuilder : public nsAHtml5TreeBuilderState bool isTemplateModeStackEmpty(); bool isSpecialParentInForeign(nsHtml5StackNode* stackNode); public: - static nsHtml5String extractCharsetFromContent(nsHtml5String attributeValue, - nsHtml5TreeBuilder* tb); + static nsHtml5String extractCharsetFromContent(nsHtml5String attributeValue, nsHtml5TreeBuilder* tb); private: void checkMetaCharset(nsHtml5HtmlAttributes* attributes); public: @@ -141,16 +138,9 @@ class nsHtml5TreeBuilder : public nsAHtml5TreeBuilderState void generateImpliedEndTagsExceptFor(nsIAtom* name); void generateImpliedEndTags(); bool isSecondOnStackBody(); - void documentModeInternal(nsHtml5DocumentMode m, - nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier, - bool html4SpecificAdditionalErrorChecks); - bool isAlmostStandards(nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier); - bool isQuirky(nsIAtom* name, - nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier, - bool forceQuirks); + void documentModeInternal(nsHtml5DocumentMode m, nsHtml5String publicIdentifier, nsHtml5String systemIdentifier, bool html4SpecificAdditionalErrorChecks); + bool isAlmostStandards(nsHtml5String publicIdentifier, nsHtml5String systemIdentifier); + bool isQuirky(nsIAtom* name, nsHtml5String publicIdentifier, nsHtml5String systemIdentifier, bool forceQuirks); void closeTheCell(int32_t eltPos); int32_t findLastInTableScopeTdTh(); void clearStackBackTo(int32_t eltPos); @@ -236,9 +226,7 @@ class nsHtml5TreeBuilder : public nsAHtml5TreeBuilderState void markMalformedIfScript(nsIContentHandle* elt); void start(bool fragmentMode); void end(); - void appendDoctypeToDocument(nsIAtom* name, - nsHtml5String publicIdentifier, - nsHtml5String systemIdentifier); + void appendDoctypeToDocument(nsIAtom* name, nsHtml5String publicIdentifier, nsHtml5String systemIdentifier); void elementPushed(int32_t ns, nsIAtom* name, nsIContentHandle* node); void elementPopped(int32_t ns, nsIAtom* name, nsIContentHandle* node); public: diff --git a/parser/html/nsHtml5UTF16Buffer.cpp b/parser/html/nsHtml5UTF16Buffer.cpp index e6db76374..4ba40eab0 100644 --- a/parser/html/nsHtml5UTF16Buffer.cpp +++ b/parser/html/nsHtml5UTF16Buffer.cpp @@ -1,6 +1,7 @@ /* * Copyright (c) 2008-2010 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), diff --git a/parser/html/nsHtml5UTF16Buffer.h b/parser/html/nsHtml5UTF16Buffer.h index cc38f6daf..5413dac87 100644 --- a/parser/html/nsHtml5UTF16Buffer.h +++ b/parser/html/nsHtml5UTF16Buffer.h @@ -1,6 +1,7 @@ /* * Copyright (c) 2008-2010 Mozilla Foundation - * Copyright (c) 2019 Moonchild Productions + * Copyright (c) 2018-2020 Moonchild Productions + * Copyright (c) 2020 Binary Outcast * * Permission is hereby granted, free of charge, to any person obtaining a * copy of this software and associated documentation files (the "Software"), -- cgit v1.2.3