Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1824516 - Make parser/htmlparser buildable outside of a unified build environment r=andi

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D173616
This commit is contained in:
serge-sans-paille 2023-03-30 13:48:34 +00:00
parent c327880929
commit 3664d8774e
4 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
parser/htmlparser/moz.build
View File

@ -50,5 +50,3 @@ FINAL_LIBRARY = "xul"
LOCAL_INCLUDES += [
"!/security/rlbox",
]
REQUIRES_UNIFIED_BUILD = True

1
parser/htmlparser/nsExpatDriver.h
View File

@ -14,6 +14,7 @@
#include "nsIInputStream.h"
#include "nsIParser.h"
#include "nsCycleCollectionParticipant.h"
#include "nsScanner.h"
#include "rlbox_expat.h"
#include "nsRLBoxExpatDriver.h"

14
parser/htmlparser/nsScanner.cpp
View File

@ -11,6 +11,7 @@
#include "mozilla/Attributes.h"
#include "mozilla/DebugOnly.h"
#include "mozilla/Encoding.h"
#include "mozilla/UniquePtr.h"
#include "nsDebug.h"
#include "nsReadableUtils.h"
#include "nsUTF8Utils.h" // for LossyConvertEncoding
@ -189,11 +190,13 @@ nsresult nsScanner::Append(const nsAString& aBuffer) {
nsresult nsScanner::Append(const char* aBuffer, uint32_t aLen) {
nsresult res = NS_OK;
if (mUnicodeDecoder) {
CheckedInt<size_t> needed = mUnicodeDecoder->MaxUTF16BufferLength(aLen);
mozilla::CheckedInt<size_t> needed =
mUnicodeDecoder->MaxUTF16BufferLength(aLen);
if (!needed.isValid()) {
return NS_ERROR_OUT_OF_MEMORY;
}
CheckedInt<uint32_t> allocLen(1); // null terminator due to legacy sadness
mozilla::CheckedInt<uint32_t> allocLen(
1); // null terminator due to legacy sadness
allocLen += needed.value();
if (!allocLen.isValid()) {
return NS_ERROR_OUT_OF_MEMORY;
@ -209,12 +212,13 @@ nsresult nsScanner::Append(const char* aBuffer, uint32_t aLen) {
// Do not use structured binding lest deal with [-Werror=unused-variable]
std::tie(result, read, written) =
mUnicodeDecoder->DecodeToUTF16WithoutReplacement(
AsBytes(Span(aBuffer, aLen)), Span(unichars, needed.value()),
AsBytes(mozilla::Span(aBuffer, aLen)),
mozilla::Span(unichars, needed.value()),
false); // Retain bug about failure to handle EOF
MOZ_ASSERT(result != kOutputFull);
MOZ_ASSERT(read <= aLen);
MOZ_ASSERT(written <= needed.value());
if (result != kInputEmpty) {
if (result != mozilla::kInputEmpty) {
// Since about:blank is empty, this line runs only for XML. Use a
// character that's illegal in XML instead of U+FFFD in order to make
// expat flag the error. There is no need to loop and convert more, since
@ -279,7 +283,7 @@ void nsScanner::SetPosition(nsScannerIterator& aPosition, bool aTerminate) {
void nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf) {
if (!mSlidingBuffer) {
mSlidingBuffer = MakeUnique<nsScannerString>(aBuf);
mSlidingBuffer = mozilla::MakeUnique<nsScannerString>(aBuf);
mSlidingBuffer->BeginReading(mCurrentPosition);
mMarkPosition = mCurrentPosition;
} else {

2
parser/htmlparser/nsScannerString.cpp
View File

@ -137,8 +137,6 @@ int32_t nsScannerSubstring::CountChar(char16_t c) const {
if (!(lengthToExamine -= lengthToExamineInThisFragment)) return result;
iter.advance(lengthToExamineInThisFragment);
}
// never reached; quiets warnings
return 0;
}
void nsScannerSubstring::Rebind(const nsScannerSubstring& aString,