зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1434399 part 16. Remove nsIXULDocument::OnDocumentParserError. r=mystor
MozReview-Commit-ID: 7LbPTqKzkO4
This commit is contained in:
Родитель
8e2fc8e6f0
Коммит
b209de830f
|
@ -111,7 +111,10 @@ public:
|
||||||
* Sometimes the caller of OnPrototypeLoadDone resumes the walk itself
|
* Sometimes the caller of OnPrototypeLoadDone resumes the walk itself
|
||||||
*/
|
*/
|
||||||
nsresult OnPrototypeLoadDone(bool aResumeWalk);
|
nsresult OnPrototypeLoadDone(bool aResumeWalk);
|
||||||
bool OnDocumentParserError() override;
|
/**
|
||||||
|
* Callback notifying when a document could not be parsed properly.
|
||||||
|
*/
|
||||||
|
bool OnDocumentParserError();
|
||||||
|
|
||||||
// nsINode interface overrides
|
// nsINode interface overrides
|
||||||
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult,
|
virtual nsresult Clone(mozilla::dom::NodeInfo *aNodeInfo, nsINode **aResult,
|
||||||
|
|
|
@ -35,11 +35,6 @@ class nsIXULDocument : public nsISupports
|
||||||
public:
|
public:
|
||||||
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXULDOCUMENT_IID)
|
NS_DECLARE_STATIC_IID_ACCESSOR(NS_IXULDOCUMENT_IID)
|
||||||
|
|
||||||
/**
|
|
||||||
* Callback notifying when a document could not be parsed properly.
|
|
||||||
*/
|
|
||||||
virtual bool OnDocumentParserError() = 0;
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reset the document direction so that it is recomputed.
|
* Reset the document direction so that it is recomputed.
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -32,7 +32,6 @@
|
||||||
#include "nsNameSpaceManager.h"
|
#include "nsNameSpaceManager.h"
|
||||||
#include "nsParserBase.h"
|
#include "nsParserBase.h"
|
||||||
#include "nsViewManager.h"
|
#include "nsViewManager.h"
|
||||||
#include "nsIXULDocument.h"
|
|
||||||
#include "nsIScriptSecurityManager.h"
|
#include "nsIScriptSecurityManager.h"
|
||||||
#include "nsLayoutCID.h"
|
#include "nsLayoutCID.h"
|
||||||
#include "nsNetUtil.h"
|
#include "nsNetUtil.h"
|
||||||
|
@ -54,6 +53,7 @@
|
||||||
#include "nsIConsoleService.h"
|
#include "nsIConsoleService.h"
|
||||||
#include "nsIScriptError.h"
|
#include "nsIScriptError.h"
|
||||||
#include "nsContentTypeParser.h"
|
#include "nsContentTypeParser.h"
|
||||||
|
#include "XULDocument.h"
|
||||||
|
|
||||||
static mozilla::LazyLogModule gContentSinkLog("nsXULContentSink");;
|
static mozilla::LazyLogModule gContentSinkLog("nsXULContentSink");;
|
||||||
|
|
||||||
|
@ -674,7 +674,7 @@ XULContentSinkImpl::ReportError(const char16_t* aErrorText,
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
};
|
};
|
||||||
|
|
||||||
nsCOMPtr<nsIXULDocument> doc = do_QueryReferent(mDocument);
|
XULDocument* doc = idoc ? idoc->AsXULDocument() : nullptr;
|
||||||
if (doc && !doc->OnDocumentParserError()) {
|
if (doc && !doc->OnDocumentParserError()) {
|
||||||
// The overlay was broken. Don't add a messy element to the master doc.
|
// The overlay was broken. Don't add a messy element to the master doc.
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
|
|
Загрузка…
Ссылка в новой задаче