Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-11 12:25:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1467802 - part 3: Create EditorBase::GetDocumentCharsetInternal() for internal use of nsIEditor::GetDocumentCharacterSet() r=m_kato

Browse Source 
This patch creates non-virtual method, EditorBase::GetDocumentCharsetInternal(),
for internal use of nsIEditor::GetDocumentCharacterSet() since the virtual
call method is redundant and the caller cannot be marked as const.

MozReview-Commit-ID: v6kDo2eKg3

--HG--
extra : rebase_source : 07f6dd8341cb6686835db2ee3ded479323cccca9
This commit is contained in:
Masayuki Nakano 2018-07-18 21:11:32 +09:00
parent 85b94e287c
commit 91c0a26b3f
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
editor/libeditor/EditorBase.cpp
View File

@ -1132,13 +1132,19 @@ EditorBase::GetDocumentModified(bool* outDocModified)
}
NS_IMETHODIMP
EditorBase::GetDocumentCharacterSet(nsACString& characterSet)
EditorBase::GetDocumentCharacterSet(nsACString& aCharset)
{
return GetDocumentCharsetInternal(aCharset);
}
nsresult
EditorBase::GetDocumentCharsetInternal(nsACString& aCharset) const
{
nsCOMPtr<nsIDocument> document = GetDocument();
if (NS_WARN_IF(!document)) {
return NS_ERROR_UNEXPECTED;
}
document->GetDocumentCharacterSet()->Name(characterSet);
document->GetDocumentCharacterSet()->Name(aCharset);
return NS_OK;
}

5
editor/libeditor/EditorBase.h
View File

@ -1650,6 +1650,11 @@ protected: // Shouldn't be used by friend classes
*/
virtual ~EditorBase();
/**
* GetDocumentCharsetInternal() returns charset of the document.
*/
nsresult GetDocumentCharsetInternal(nsACString& aCharset) const;
/**
* SelectAllInternal() should be used instead of SelectAll() in editor
* because SelectAll() creates AutoEditActionSetter but we should avoid

10
editor/libeditor/TextEditor.cpp
View File

@ -1811,14 +1811,14 @@ TextEditor::OutputToString(const nsAString& aFormatType,
return rv;
}
nsAutoCString charsetStr;
rv = GetDocumentCharacterSet(charsetStr);
if (NS_FAILED(rv) || charsetStr.IsEmpty()) {
charsetStr.AssignLiteral("windows-1252");
nsAutoCString charset;
rv = GetDocumentCharsetInternal(charset);
if (NS_FAILED(rv) || charset.IsEmpty()) {
charset.AssignLiteral("windows-1252");
}
nsCOMPtr<nsIDocumentEncoder> encoder =
GetAndInitDocEncoder(aFormatType, aFlags, charsetStr);
GetAndInitDocEncoder(aFormatType, aFlags, charset);
if (NS_WARN_IF(!encoder)) {
return NS_ERROR_FAILURE;
}