mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1334290 - Remove useless fields from nsScanner. r=mrbkap. 

MozReview-Commit-ID: 6LnvmOGrGwz
This commit is contained in:
Henri Sivonen 2017-02-17 08:44:49 +02:00
Родитель 87ae1a50e4
Коммит 9e44819763
6 изменённых файлов: 15 добавлений и 138 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
parser/htmlparser/nsExpatDriver.cpp
Просмотреть файл

@ -1306,9 +1306,6 @@ nsExpatDriver::WillBuildModel(const CParserContext& aParserContext,
// Set up the user data.
XML_SetUserData(mExpatParser, this);
// XML must detect invalid character convertion
aParserContext.mScanner->OverrideReplacementCharacter(0xffff);
return mInternalState;
}

7
parser/htmlparser/nsParser.cpp
Просмотреть файл

@ -1358,7 +1358,7 @@ ParserWriteFunc(nsIInputStream* in,
}
result = pws->mScanner->Append(fromRawSegment, theNumRead, pws->mRequest);
result = pws->mScanner->Append(fromRawSegment, theNumRead);
if (NS_SUCCEEDED(result)) {
*writeCount = count;
}
@ -1420,10 +1420,7 @@ nsParser::OnDataAvailable(nsIRequest *request, nsISupports* aContext,
return rv;
}
// Don't bother to start parsing until we've seen some
// non-whitespace data
if (IsOkToProcessNetworkData() &&
theContext->mScanner->FirstNonWhitespacePosition() >= 0) {
if (IsOkToProcessNetworkData()) {
nsCOMPtr<nsIParser> kungFuDeathGrip(this);
nsCOMPtr<nsIContentSink> sinkDeathGrip(mSink);
mProcessingNetworkData = true;

91
parser/htmlparser/nsScanner.cpp
Просмотреть файл

@ -56,8 +56,6 @@ nsScanner::nsScanner(const nsAString& anHTMLString)
MOZ_COUNT_CTOR(nsScanner);
mSlidingBuffer = nullptr;
mCountRemaining = 0;
mFirstNonWhitespacePosition = -1;
if (AppendToBuffer(anHTMLString)) {
mSlidingBuffer->BeginReading(mCurrentPosition);
} else {
@ -69,8 +67,6 @@ nsScanner::nsScanner(const nsAString& anHTMLString)
mIncremental = false;
mUnicodeDecoder = nullptr;
mCharsetSource = kCharsetUninitialized;
mHasInvalidCharacter = false;
mReplacementCharacter = char16_t(0x0);
}
/**
@ -96,13 +92,9 @@ nsScanner::nsScanner(nsString& aFilename, bool aCreateStream)
mEndPosition = mCurrentPosition;
mIncremental = true;
mFirstNonWhitespacePosition = -1;
mCountRemaining = 0;
mUnicodeDecoder = nullptr;
mCharsetSource = kCharsetUninitialized;
mHasInvalidCharacter = false;
mReplacementCharacter = char16_t(0x0);
// XML defaults to UTF-8 and about:blank is UTF-8, too.
SetDocumentCharset(NS_LITERAL_CSTRING("UTF-8"), kCharsetFromDocTypeDefault);
}
@ -160,7 +152,6 @@ nsScanner::~nsScanner() {
*/
void nsScanner::RewindToMark(void){
if (mSlidingBuffer) {
mCountRemaining += (Distance(mMarkPosition, mCurrentPosition));
mCurrentPosition = mMarkPosition;
}
}
@ -207,8 +198,6 @@ bool nsScanner::UngetReadable(const nsAString& aBuffer) {
mSlidingBuffer->BeginReading(mCurrentPosition); // Insertion invalidated our iterators
mSlidingBuffer->EndReading(mEndPosition);
uint32_t length = aBuffer.Length();
mCountRemaining += length; // Ref. bug 117441
return true;
}
@ -232,8 +221,7 @@ nsresult nsScanner::Append(const nsAString& aBuffer) {
* @param
* @return
*/
nsresult nsScanner::Append(const char* aBuffer, uint32_t aLen,
nsIRequest *aRequest)
nsresult nsScanner::Append(const char* aBuffer, uint32_t aLen)
{
nsresult res = NS_OK;
if (mUnicodeDecoder) {
@ -250,7 +238,6 @@ nsresult nsScanner::Append(const char* aBuffer, uint32_t aLen,
int32_t totalChars = 0;
int32_t unicharLength = unicharBufLen;
int32_t errorPos = -1;
do {
int32_t srcLength = aLen;
@ -270,12 +257,10 @@ nsresult nsScanner::Append(const char* aBuffer, uint32_t aLen,
break;
}
if (mReplacementCharacter == 0x0 && errorPos == -1) {
errorPos = totalChars;
}
unichars[unicharLength++] = mReplacementCharacter == 0x0 ?
mUnicodeDecoder->GetCharacterForUnMapped() :
mReplacementCharacter;
// 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.
unichars[unicharLength++] = 0xFFFF;
unichars = unichars + unicharLength;
unicharLength = unicharBufLen - (++totalChars);
@ -299,7 +284,7 @@ nsresult nsScanner::Append(const char* aBuffer, uint32_t aLen,
// since it doesn't reflect on our success or failure
// - Ref. bug 87110
res = NS_OK;
if (!AppendToBuffer(buffer, aRequest, errorPos))
if (!AppendToBuffer(buffer))
res = NS_ERROR_OUT_OF_MEMORY;
}
else {
@ -324,7 +309,6 @@ nsresult nsScanner::GetChar(char16_t& aChar) {
}
aChar = *mCurrentPosition++;
--mCountRemaining;
return NS_OK;
}
@ -344,25 +328,9 @@ void nsScanner::EndReading(nsScannerIterator& aPosition)
aPosition = mEndPosition;
}
void nsScanner::SetPosition(nsScannerIterator& aPosition, bool aTerminate, bool aReverse)
void nsScanner::SetPosition(nsScannerIterator& aPosition, bool aTerminate)
{
if (mSlidingBuffer) {
#ifdef DEBUG
uint32_t origRemaining = mCountRemaining;
#endif
if (aReverse) {
mCountRemaining += (Distance(aPosition, mCurrentPosition));
}
else {
mCountRemaining -= (Distance(mCurrentPosition, aPosition));
}
NS_ASSERTION((mCountRemaining >= origRemaining && aReverse) ||
(mCountRemaining <= origRemaining && !aReverse),
"Improper use of nsScanner::SetPosition. Make sure to set the"
" aReverse parameter correctly");
mCurrentPosition = aPosition;
if (aTerminate && (mCurrentPosition == mEndPosition)) {
mMarkPosition = mCurrentPosition;
@ -371,19 +339,8 @@ void nsScanner::SetPosition(nsScannerIterator& aPosition, bool aTerminate, bool
}
}
void nsScanner::ReplaceCharacter(nsScannerIterator& aPosition,
char16_t aChar)
bool nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf)
{
if (mSlidingBuffer) {
mSlidingBuffer->ReplaceCharacter(aPosition, aChar);
}
}
bool nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf,
nsIRequest *aRequest,
int32_t aErrorPos)
{
uint32_t countRemaining = mCountRemaining;
if (!mSlidingBuffer) {
mSlidingBuffer = new nsScannerString(aBuf);
if (!mSlidingBuffer)
@ -391,7 +348,6 @@ bool nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf,
mSlidingBuffer->BeginReading(mCurrentPosition);
mMarkPosition = mCurrentPosition;
mSlidingBuffer->EndReading(mEndPosition);
mCountRemaining = aBuf->DataLength();
}
else {
mSlidingBuffer->AppendBuffer(aBuf);
@ -399,29 +355,8 @@ bool nsScanner::AppendToBuffer(nsScannerString::Buffer* aBuf,
mSlidingBuffer->BeginReading(mCurrentPosition);
}
mSlidingBuffer->EndReading(mEndPosition);
mCountRemaining += aBuf->DataLength();
}
if (aErrorPos != -1 && !mHasInvalidCharacter) {
mHasInvalidCharacter = true;
mFirstInvalidPosition = mCurrentPosition;
mFirstInvalidPosition.advance(countRemaining + aErrorPos);
}
if (mFirstNonWhitespacePosition == -1) {
nsScannerIterator iter(mCurrentPosition);
nsScannerIterator end(mEndPosition);
while (iter != end) {
if (!nsCRT::IsAsciiSpace(*iter)) {
mFirstNonWhitespacePosition = Distance(mCurrentPosition, iter);
break;
}
++iter;
}
}
return true;
}
@ -471,13 +406,3 @@ void nsScanner::SelfTest(void) {
#ifdef _DEBUG
#endif
}
void nsScanner::OverrideReplacementCharacter(char16_t aReplacementCharacter)
{
mReplacementCharacter = aReplacementCharacter;
if (mHasInvalidCharacter) {
ReplaceCharacter(mFirstInvalidPosition, mReplacementCharacter);
}
}

38
parser/htmlparser/nsScanner.h
Просмотреть файл

@ -24,6 +24,7 @@
#include "nsIParser.h"
#include "nsIUnicodeDecoder.h"
#include "nsScannerString.h"
#include "mozilla/CheckedInt.h"
class nsReadEndCondition {
public:
@ -109,8 +110,7 @@ class nsScanner {
* @param
* @return
*/
nsresult Append(const char* aBuffer, uint32_t aLen,
nsIRequest *aRequest);
nsresult Append(const char* aBuffer, uint32_t aLen);
/**
* Call this to copy bytes out of the scanner that have not yet been consumed
@ -148,10 +148,7 @@ class nsScanner {
void CurrentPosition(nsScannerIterator& aPosition);
void EndReading(nsScannerIterator& aPosition);
void SetPosition(nsScannerIterator& aPosition,
bool aTruncate = false,
bool aReverse = false);
void ReplaceCharacter(nsScannerIterator& aPosition,
char16_t aChar);
bool aTruncate = false);
/**
* Internal method used to cause the internal buffer to
@ -162,34 +159,15 @@ class nsScanner {
bool IsIncremental(void) {return mIncremental;}
void SetIncremental(bool anIncrValue) {mIncremental=anIncrValue;}
/**
* Return the position of the first non-whitespace
* character. This is only reliable before consumers start
* reading from this scanner.
*/
int32_t FirstNonWhitespacePosition()
{
return mFirstNonWhitespacePosition;
}
/**
* Override replacement character used by nsIUnicodeDecoder.
* Default behavior is that it uses nsIUnicodeDecoder's mapping.
*
* @param aReplacementCharacter the replacement character
* XML (expat) parser uses 0xffff
*/
void OverrideReplacementCharacter(char16_t aReplacementCharacter);
protected:
bool AppendToBuffer(nsScannerString::Buffer *, nsIRequest *aRequest, int32_t aErrorPos = -1);
bool AppendToBuffer(nsScannerString::Buffer* aBuffer);
bool AppendToBuffer(const nsAString& aStr)
{
nsScannerString::Buffer* buf = nsScannerString::AllocBufferFromString(aStr);
if (!buf)
return false;
AppendToBuffer(buf, nullptr);
AppendToBuffer(buf);
return true;
}
@ -197,14 +175,8 @@ class nsScanner {
nsScannerIterator mCurrentPosition; // The position we will next read from in the scanner buffer
nsScannerIterator mMarkPosition; // The position last marked (we may rewind to here)
nsScannerIterator mEndPosition; // The current end of the scanner buffer
nsScannerIterator mFirstInvalidPosition; // The position of the first invalid character that was detected
nsString mFilename;
uint32_t mCountRemaining; // The number of bytes still to be read
// from the scanner buffer
bool mIncremental;
bool mHasInvalidCharacter;
char16_t mReplacementCharacter;
int32_t mFirstNonWhitespacePosition;
int32_t mCharsetSource;
nsCString mCharset;
nsCOMPtr<nsIUnicodeDecoder> mUnicodeDecoder;

13
parser/htmlparser/nsScannerString.cpp
Просмотреть файл

@ -373,19 +373,6 @@ nsScannerString::UngetReadable( const nsAString& aReadable, const nsScannerItera
mIsDirty = true;
}
void
nsScannerString::ReplaceCharacter(nsScannerIterator& aPosition, char16_t aChar)
{
// XXX Casting a const to non-const. Unless the base class
// provides support for writing iterators, this is the best
// that can be done.
char16_t* pos = const_cast<char16_t*>(aPosition.get());
*pos = aChar;
mIsDirty = true;
}
/**
* nsScannerSharedSubstring
*/

1
parser/htmlparser/nsScannerString.h
Просмотреть файл

@ -267,7 +267,6 @@ class nsScannerString : public nsScannerSubstring
// any other way you want to do this?
void UngetReadable(const nsAString& aReadable, const nsScannerIterator& aCurrentPosition);
void ReplaceCharacter(nsScannerIterator& aPosition, char16_t aChar);
};