Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-21 01:05:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout changeset bb29532b1b73 (bug 1190172 part 11)

Browse Source 
--HG--
extra : rebase_source : 08096495e936bfd6517d6651149ec65c96805980
This commit is contained in:
Masayuki Nakano 2016-04-23 19:57:09 +09:00
parent 2ef6ade2c4
commit 3aba3916c7
2 changed files with 26 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
editor/libeditor/nsHTMLEditRules.cpp
View File

@ -1556,7 +1556,7 @@ nsHTMLEditRules::WillInsertBreak(Selection& aSelection, bool* aCancel,
// "Text" is deleted leaving an empty block. We want to put in one br to // "Text" is deleted leaving an empty block. We want to put in one br to
// make block have a line. Then code further below will put in a second br.) // make block have a line. Then code further below will put in a second br.)
bool isEmpty; bool isEmpty;
IsEmptyBlock(*blockParent, &isEmpty); IsEmptyBlock(GetAsDOMNode(blockParent), &isEmpty);
if (isEmpty) { if (isEmpty) {
nsCOMPtr<Element> br = mHTMLEditor->CreateBR(blockParent, nsCOMPtr<Element> br = mHTMLEditor->CreateBR(blockParent,
blockParent->Length()); blockParent->Length());
@ -4526,24 +4526,29 @@ nsHTMLEditRules::CreateStyleForInsertText(Selection& aSelection,
} }
/** ///////////////////////////////////////////////////////////////////////////
* Figure out if aNode is (or is inside) an empty block. A block can have // IsEmptyBlock: figure out if aNode is (or is inside) an empty block.
* children and still be considered empty, if the children are empty or // A block can have children and still be considered empty,
* non-editable. // if the children are empty or non-editable.
*/ //
nsresult nsresult
nsHTMLEditRules::IsEmptyBlock(Element& aNode, nsHTMLEditRules::IsEmptyBlock(nsIDOMNode *aNode,
bool* aOutIsEmptyBlock, bool *outIsEmptyBlock,
MozBRCounts aMozBRCounts) bool aMozBRDoesntCount,
bool aListItemsNotEmpty)
{ {
MOZ_ASSERT(aOutIsEmptyBlock); NS_ENSURE_TRUE(aNode && outIsEmptyBlock, NS_ERROR_NULL_POINTER);
*aOutIsEmptyBlock = true; *outIsEmptyBlock = true;
NS_ENSURE_TRUE(IsBlockNode(aNode.AsDOMNode()), NS_ERROR_NULL_POINTER); // nsresult res = NS_OK;
nsCOMPtr<nsIDOMNode> nodeToTest;
if (IsBlockNode(aNode)) nodeToTest = do_QueryInterface(aNode);
// else nsCOMPtr<nsIDOMElement> block;
// looks like I forgot to finish this. Wonder what I was going to do?
return mHTMLEditor->IsEmptyNode(aNode.AsDOMNode(), aOutIsEmptyBlock, NS_ENSURE_TRUE(nodeToTest, NS_ERROR_NULL_POINTER);
aMozBRCounts == MozBRCounts::yes ? false return mHTMLEditor->IsEmptyNode(nodeToTest, outIsEmptyBlock,
: true); aMozBRDoesntCount, aListItemsNotEmpty);
} }
@ -6321,7 +6326,7 @@ nsHTMLEditRules::ReturnInHeader(Selection& aSelection,
// If the new (righthand) header node is empty, delete it // If the new (righthand) header node is empty, delete it
bool isEmpty; bool isEmpty;
res = IsEmptyBlock(aHeader, &isEmpty, MozBRCounts::no); res = IsEmptyBlock(aHeader.AsDOMNode(), &isEmpty, true);
NS_ENSURE_SUCCESS(res, res); NS_ENSURE_SUCCESS(res, res);
if (isEmpty) { if (isEmpty) {
res = mHTMLEditor->DeleteNode(&aHeader); res = mHTMLEditor->DeleteNode(&aHeader);
@ -6574,7 +6579,7 @@ nsHTMLEditRules::ReturnInListItem(Selection& aSelection,
// only if prefs say it's okay and if the parent isn't the active editing // only if prefs say it's okay and if the parent isn't the active editing
// host. // host.
bool isEmpty; bool isEmpty;
nsresult res = IsEmptyBlock(aListItem, &isEmpty, MozBRCounts::no); nsresult res = IsEmptyBlock(aListItem.AsDOMNode(), &isEmpty, true, false);
NS_ENSURE_SUCCESS(res, res); NS_ENSURE_SUCCESS(res, res);
if (isEmpty && root != list && mReturnInEmptyLIKillsList) { if (isEmpty && root != list && mReturnInEmptyLIKillsList) {
// Get the list offset now -- before we might eventually split the list // Get the list offset now -- before we might eventually split the list

8
editor/libeditor/nsHTMLEditRules.h
View File

@ -249,10 +249,10 @@ protected:
nsresult CreateStyleForInsertText(mozilla::dom::Selection& aSelection, nsresult CreateStyleForInsertText(mozilla::dom::Selection& aSelection,
nsIDocument& aDoc); nsIDocument& aDoc);
enum class MozBRCounts { yes, no }; nsresult IsEmptyBlock(nsIDOMNode *aNode,
nsresult IsEmptyBlock(mozilla::dom::Element& aNode, bool *outIsEmptyBlock,
bool* aOutIsEmptyBlock, bool aMozBRDoesntCount = false,
MozBRCounts aMozBRCounts = MozBRCounts::yes); bool aListItemsNotEmpty = false);
nsresult CheckForEmptyBlock(nsINode* aStartNode, nsresult CheckForEmptyBlock(nsINode* aStartNode,
mozilla::dom::Element* aBodyNode, mozilla::dom::Element* aBodyNode,
mozilla::dom::Selection* aSelection, mozilla::dom::Selection* aSelection,