зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1446568: Make nsIDocument SetContentType / SetDocumentCharacterSet not pure virtual. r=smaug
No good reason for them to be. MozReview-Commit-ID: 7bFVD8YFqo2
This commit is contained in:
Родитель
1bbc934001
Коммит
6b3537c326
|
@ -3363,7 +3363,7 @@ nsIDocument::GetContentType(nsAString& aContentType)
|
|||
}
|
||||
|
||||
void
|
||||
nsDocument::SetContentType(const nsAString& aContentType)
|
||||
nsIDocument::SetContentType(const nsAString& aContentType)
|
||||
{
|
||||
SetContentTypeInternal(NS_ConvertUTF16toUTF8(aContentType));
|
||||
}
|
||||
|
@ -3746,7 +3746,7 @@ nsIDocument::DefaultStyleAttrURLData()
|
|||
}
|
||||
|
||||
void
|
||||
nsDocument::SetDocumentCharacterSet(NotNull<const Encoding*> aEncoding)
|
||||
nsIDocument::SetDocumentCharacterSet(NotNull<const Encoding*> aEncoding)
|
||||
{
|
||||
if (mCharacterSet != aEncoding) {
|
||||
mCharacterSet = aEncoding;
|
||||
|
|
|
@ -162,18 +162,6 @@ public:
|
|||
|
||||
virtual void StopDocumentLoad() override;
|
||||
|
||||
/**
|
||||
* Set the Content-Type of this document.
|
||||
*/
|
||||
virtual void SetContentType(const nsAString& aContentType) override;
|
||||
|
||||
/**
|
||||
* Set the document's character encoding. This will
|
||||
* trigger a startDocumentLoad if necessary to answer the question.
|
||||
*/
|
||||
virtual void
|
||||
SetDocumentCharacterSet(NotNull<const Encoding*> aEncoding) override;
|
||||
|
||||
static bool CallerIsTrustedAboutPage(JSContext* aCx, JSObject* aObject);
|
||||
static bool IsElementAnimateEnabled(JSContext* aCx, JSObject* aObject);
|
||||
static bool IsWebAnimationsEnabled(JSContext* aCx, JSObject* aObject);
|
||||
|
|
|
@ -789,7 +789,7 @@ public:
|
|||
/**
|
||||
* Set the document's character encoding.
|
||||
*/
|
||||
virtual void SetDocumentCharacterSet(NotNull<const Encoding*> aEncoding) = 0;
|
||||
virtual void SetDocumentCharacterSet(NotNull<const Encoding*> aEncoding);
|
||||
|
||||
int32_t GetDocumentCharacterSetSource() const
|
||||
{
|
||||
|
@ -858,7 +858,7 @@ public:
|
|||
/**
|
||||
* Set the Content-Type of this document.
|
||||
*/
|
||||
virtual void SetContentType(const nsAString& aContentType) = 0;
|
||||
virtual void SetContentType(const nsAString& aContentType);
|
||||
|
||||
/**
|
||||
* Return the language of this document.
|
||||
|
|
Загрузка…
Ссылка в новой задаче