diff --git a/parser/html/nsHtml5Parser.cpp b/parser/html/nsHtml5Parser.cpp index 103a0883cbf2..75477edad052 100644 --- a/parser/html/nsHtml5Parser.cpp +++ b/parser/html/nsHtml5Parser.cpp @@ -587,7 +587,7 @@ nsHtml5Parser::IsScriptCreated() void nsHtml5Parser::ParseUntilBlocked() { - if (mBlocked || mExecutor->IsComplete() || mExecutor->IsBroken()) { + if (mBlocked || mExecutor->IsComplete() || NS_FAILED(mExecutor->IsBroken())) { return; } NS_ASSERTION(mExecutor->HasStarted(), "Bad life cycle."); diff --git a/parser/html/nsHtml5StreamParser.cpp b/parser/html/nsHtml5StreamParser.cpp index 3a47d60587ed..cf81d545fa8b 100644 --- a/parser/html/nsHtml5StreamParser.cpp +++ b/parser/html/nsHtml5StreamParser.cpp @@ -1412,7 +1412,7 @@ nsHtml5StreamParser::ContinueAfterScripts(nsHtml5Tokenizer* aTokenizer, NS_ASSERTION(NS_IsMainThread(), "Wrong thread!"); NS_ASSERTION(!(mMode == VIEW_SOURCE_HTML || mMode == VIEW_SOURCE_XML), "ContinueAfterScripts called in view source mode!"); - if (mExecutor->IsBroken()) { + if (NS_FAILED(mExecutor->IsBroken())) { return; } #ifdef DEBUG diff --git a/parser/html/nsHtml5TreeOpExecutor.cpp b/parser/html/nsHtml5TreeOpExecutor.cpp index c7b4a4f3130f..3af7fdc3dad0 100644 --- a/parser/html/nsHtml5TreeOpExecutor.cpp +++ b/parser/html/nsHtml5TreeOpExecutor.cpp @@ -146,7 +146,7 @@ nsHtml5TreeOpExecutor::DidBuildModel(bool aTerminated) // This comes from nsXMLContentSink and nsHTMLContentSink // If this parser has been marked as broken, treat the end of parse as // forced termination. - DidBuildModelImpl(aTerminated || IsBroken()); + DidBuildModelImpl(aTerminated || NS_FAILED(IsBroken())); if (!mLayoutStarted) { // We never saw the body, and layout never got started. Force @@ -480,7 +480,7 @@ nsHtml5TreeOpExecutor::RunFlushLoop() return; } - if (IsBroken()) { + if (NS_FAILED(IsBroken())) { return; } @@ -936,7 +936,7 @@ nsHtml5TreeOpExecutor::Reset() mFlushState = eNotFlushing; mRunFlushLoopOnStack = false; MOZ_ASSERT(!mReadingFromStage); - MOZ_ASSERT(!mBroken); + MOZ_ASSERT(NS_SUCCEEDED(mBroken)); } void