mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1056166 part 1 - Clean up nsHTMLEditRules::SplitAsNeeded; r=ehsan

This commit is contained in:
Aryeh Gregor 2014-08-29 14:43:23 +03:00
Родитель df2ea302f1
Коммит 7752358f63
2 изменённых файлов: 176 добавлений и 238 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

405
editor/libeditor/nsHTMLEditRules.cpp
Просмотреть файл

@ -3145,8 +3145,7 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
if (!aSelection || !aListType || !aCancel || !aHandled) {
return NS_ERROR_NULL_POINTER;
}
nsCOMPtr<nsIAtom> listTypeAtom = do_GetAtom(*aListType);
NS_ENSURE_TRUE(listTypeAtom, NS_ERROR_OUT_OF_MEMORY);
nsCOMPtr<nsIAtom> listType = do_GetAtom(*aListType);
nsresult res = WillInsert(aSelection, aCancel);
NS_ENSURE_SUCCESS(res, res);
@ -3161,7 +3160,7 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
if (aItemType) {
itemType = do_GetAtom(*aItemType);
NS_ENSURE_TRUE(itemType, NS_ERROR_OUT_OF_MEMORY);
} else if (listTypeAtom == nsGkAtoms::dl) {
} else if (listType == nsGkAtoms::dl) {
itemType = nsGkAtoms::dd;
} else {
itemType = nsGkAtoms::li;
@ -3199,9 +3198,6 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
// if no nodes, we make empty list. Ditto if the user tried to make a list
// of some # of breaks.
if (!listCount || bOnlyBreaks) {
nsCOMPtr<nsIDOMNode> parent, theList, theListItem;
int32_t offset;
// if only breaks, delete them
if (bOnlyBreaks) {
for (int32_t j = 0; j < (int32_t)listCount; j++) {
@ -3212,29 +3208,31 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
}
// get selection location
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetStartNodeAndOffset(aSelection,
getter_AddRefs(parent), &offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(aSelection->RangeCount());
nsCOMPtr<nsINode> parent = aSelection->GetRangeAt(0)->GetStartParent();
int32_t offset = aSelection->GetRangeAt(0)->StartOffset();
NS_ENSURE_STATE(parent);
// make sure we can put a list here
NS_ENSURE_STATE(mHTMLEditor);
if (!mHTMLEditor->CanContainTag(parent, listTypeAtom)) {
if (!mHTMLEditor->CanContainTag(parent->AsDOMNode(), listType)) {
*aCancel = true;
return NS_OK;
}
res = SplitAsNeeded(aListType, address_of(parent), &offset);
res = SplitAsNeeded(*listType, parent, offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(*aListType, parent, offset,
getter_AddRefs(theList));
NS_ENSURE_SUCCESS(res, res);
nsCOMPtr<Element> theList =
mHTMLEditor->CreateNode(listType, parent, offset);
NS_ENSURE_STATE(theList);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(nsDependentAtomString(itemType), theList, 0,
getter_AddRefs(theListItem));
NS_ENSURE_SUCCESS(res, res);
nsCOMPtr<Element> theListItem =
mHTMLEditor->CreateNode(itemType, theList, 0);
NS_ENSURE_STATE(theListItem);
// remember our new block for postprocessing
mNewBlock = theListItem;
mNewBlock = GetAsDOMNode(theListItem);
// put selection in new list item
res = aSelection->Collapse(theListItem, 0);
// to prevent selection resetter from overriding us
@ -3253,18 +3251,14 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
// or whatever is approriate. Wohoo!
listCount = arrayOfNodes.Count();
nsCOMPtr<nsIDOMNode> curParent;
nsCOMPtr<nsIDOMNode> curList;
nsCOMPtr<nsIContent> curListAsContent;
nsCOMPtr<Element> prevListItem;
nsCOMPtr<nsINode> curParent;
nsCOMPtr<Element> curList, prevListItem;
for (int32_t i = 0; i < listCount; i++) {
// here's where we actually figure out what to do
nsCOMPtr<nsIDOMNode> newBlock;
nsCOMPtr<nsIDOMNode> curNode = arrayOfNodes[i];
nsCOMPtr<nsIContent> curNodeAsContent = do_QueryInterface(curNode);
nsCOMPtr<Element> curNodeAsElement = curNodeAsContent->IsElement()
? curNodeAsContent->AsElement() : nullptr;
nsCOMPtr<nsIContent> curNode = do_QueryInterface(arrayOfNodes[i]);
NS_ENSURE_STATE(curNode);
int32_t offset;
curParent = nsEditor::GetNodeLocation(curNode, &offset);
@ -3274,9 +3268,6 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
curList = nullptr;
}
curListAsContent = do_QueryInterface(curList);
NS_ENSURE_STATE(curListAsContent || !curList);
// if curNode is a Break, delete it, and quit remembering prev list item
if (nsTextEditUtils::IsBreak(curNode)) {
NS_ENSURE_STATE(mHTMLEditor);
@ -3284,7 +3275,7 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
NS_ENSURE_SUCCESS(res, res);
prevListItem = 0;
continue;
} else if (IsEmptyInline(curNode)) {
} else if (IsEmptyInline(GetAsDOMNode(curNode))) {
// if curNode is an empty inline container, delete it
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->DeleteNode(curNode);
@ -3300,21 +3291,20 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
// first: that routine handles converting the list item types, if
// needed
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->MoveNode(curNodeAsContent, curListAsContent, -1);
res = mHTMLEditor->MoveNode(curNode, curList, -1);
NS_ENSURE_SUCCESS(res, res);
res = ConvertListType(curNode, address_of(newBlock), listTypeAtom,
itemType);
res = ConvertListType(GetAsDOMNode(curNode), address_of(newBlock),
listType, itemType);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->RemoveBlockContainer(newBlock);
NS_ENSURE_SUCCESS(res, res);
} else {
// replace list with new list type
res = ConvertListType(curNode, address_of(newBlock), listTypeAtom,
itemType);
res = ConvertListType(GetAsDOMNode(curNode), address_of(newBlock),
listType, itemType);
NS_ENSURE_SUCCESS(res, res);
curList = newBlock;
curListAsContent = do_QueryInterface(curList);
curList = do_QueryInterface(newBlock);
}
prevListItem = 0;
continue;
@ -3322,53 +3312,51 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
if (nsHTMLEditUtils::IsListItem(curNode)) {
NS_ENSURE_STATE(mHTMLEditor);
if (mHTMLEditor->GetTag(curParent) != listTypeAtom) {
if (curParent->Tag() != listType) {
// list item is in wrong type of list. if we don't have a curList,
// split the old list and make a new list of correct type.
if (!curList || nsEditorUtils::IsDescendantOf(curNode, curList)) {
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->SplitNode(curParent, offset,
res = mHTMLEditor->SplitNode(curParent->AsDOMNode(), offset,
getter_AddRefs(newBlock));
NS_ENSURE_SUCCESS(res, res);
int32_t offset;
nsCOMPtr<nsIDOMNode> parent = nsEditor::GetNodeLocation(curParent, &offset);
nsCOMPtr<nsINode> parent = nsEditor::GetNodeLocation(curParent,
&offset);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(*aListType, parent, offset,
getter_AddRefs(curList));
NS_ENSURE_SUCCESS(res, res);
curListAsContent = do_QueryInterface(curList);
curList = mHTMLEditor->CreateNode(listType, parent, offset);
NS_ENSURE_STATE(curList);
}
// move list item to new list
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->MoveNode(curNodeAsContent, curListAsContent, -1);
res = mHTMLEditor->MoveNode(curNode, curList, -1);
NS_ENSURE_SUCCESS(res, res);
// convert list item type if needed
NS_ENSURE_STATE(mHTMLEditor);
if (!mHTMLEditor->NodeIsType(curNode, itemType)) {
if (curNode->Tag() != itemType) {
NS_ENSURE_STATE(mHTMLEditor);
NS_ENSURE_STATE(curNodeAsElement);
newBlock = dont_AddRef(GetAsDOMNode(
mHTMLEditor->ReplaceContainer(curNodeAsElement, itemType).take()));
mHTMLEditor->ReplaceContainer(curNode->AsElement(),
itemType).take()));
NS_ENSURE_STATE(newBlock);
}
} else {
// item is in right type of list. But we might still have to move it.
// and we might need to convert list item types.
if (!curList) {
curList = curParent;
curListAsContent = do_QueryInterface(curList);
curList = curParent->AsElement();
} else if (curParent != curList) {
// move list item to new list
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->MoveNode(curNodeAsContent, curListAsContent, -1);
res = mHTMLEditor->MoveNode(curNode, curList, -1);
NS_ENSURE_SUCCESS(res, res);
}
NS_ENSURE_STATE(mHTMLEditor);
if (!mHTMLEditor->NodeIsType(curNode, itemType)) {
if (curNode->Tag() != itemType) {
NS_ENSURE_STATE(mHTMLEditor);
NS_ENSURE_STATE(curNodeAsElement);
newBlock = dont_AddRef(GetAsDOMNode(
mHTMLEditor->ReplaceContainer(curNodeAsElement, itemType).take()));
mHTMLEditor->ReplaceContainer(curNode->AsElement(),
itemType).take()));
NS_ENSURE_STATE(newBlock);
}
}
@ -3387,14 +3375,13 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
// if we hit a div clear our prevListItem, insert divs contents
// into our node array, and remove the div
if (nsHTMLEditUtils::IsDiv(curNode)) {
if (curNode->Tag() == nsGkAtoms::div) {
prevListItem = nullptr;
int32_t j = i + 1;
res = GetInnerContent(curNode, arrayOfNodes, &j);
res = GetInnerContent(curNode->AsDOMNode(), arrayOfNodes, &j);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(mHTMLEditor);
NS_ENSURE_STATE(curNodeAsElement);
res = mHTMLEditor->RemoveContainer(curNodeAsElement);
res = mHTMLEditor->RemoveContainer(curNode);
NS_ENSURE_SUCCESS(res, res);
listCount = arrayOfNodes.Count();
continue;
@ -3402,15 +3389,13 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
// need to make a list to put things in if we haven't already,
if (!curList) {
res = SplitAsNeeded(aListType, address_of(curParent), &offset);
res = SplitAsNeeded(*listType, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(*aListType, curParent, offset,
getter_AddRefs(curList));
curList = mHTMLEditor->CreateNode(listType, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curListAsContent = do_QueryInterface(curList);
// remember our new block for postprocessing
mNewBlock = curList;
mNewBlock = GetAsDOMNode(curList);
// curList is now the correct thing to put curNode in
prevListItem = 0;
}
@ -3418,43 +3403,39 @@ nsHTMLEditRules::WillMakeList(Selection* aSelection,
// if curNode isn't a list item, we must wrap it in one
nsCOMPtr<Element> listItem;
if (!nsHTMLEditUtils::IsListItem(curNode)) {
if (IsInlineNode(curNode) && prevListItem) {
if (IsInlineNode(GetAsDOMNode(curNode)) && prevListItem) {
// this is a continuation of some inline nodes that belong together in
// the same list item. use prevListItem
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->MoveNode(curNodeAsContent, prevListItem, -1);
res = mHTMLEditor->MoveNode(curNode, prevListItem, -1);
NS_ENSURE_SUCCESS(res, res);
} else {
// don't wrap li around a paragraph. instead replace paragraph with li
if (nsHTMLEditUtils::IsParagraph(curNode)) {
if (curNode->Tag() == nsGkAtoms::p) {
NS_ENSURE_STATE(mHTMLEditor);
NS_ENSURE_STATE(curNodeAsElement);
listItem = mHTMLEditor->ReplaceContainer(curNodeAsElement, itemType);
listItem = mHTMLEditor->ReplaceContainer(curNode->AsElement(),
itemType);
NS_ENSURE_STATE(listItem);
} else {
NS_ENSURE_STATE(mHTMLEditor);
NS_ENSURE_STATE(curNodeAsContent);
listItem = mHTMLEditor->InsertContainerAbove(curNodeAsContent,
itemType);
listItem = mHTMLEditor->InsertContainerAbove(curNode, itemType);
NS_ENSURE_STATE(listItem);
}
if (IsInlineNode(curNode)) {
if (IsInlineNode(GetAsDOMNode(curNode))) {
prevListItem = listItem;
} else {
prevListItem = nullptr;
}
}
} else {
listItem = curNodeAsElement;
listItem = curNode->AsElement();
}
if (listItem) {
// if we made a new list item, deal with it: tuck the listItem into the
// end of the active list
NS_ENSURE_STATE(mHTMLEditor);
nsCOMPtr<nsINode> curList_ = do_QueryInterface(curList);
NS_ENSURE_STATE(curList_);
res = mHTMLEditor->MoveNode(listItem, curList_, -1);
res = mHTMLEditor->MoveNode(listItem, curList, -1);
NS_ENSURE_SUCCESS(res, res);
}
}
@ -3550,6 +3531,7 @@ nsHTMLEditRules::WillMakeBasicBlock(Selection* aSelection,
bool *aCancel,
bool *aHandled)
{
nsCOMPtr<nsIAtom> blockType = do_GetAtom(*aBlockType);
if (!aSelection || !aCancel || !aHandled) { return NS_ERROR_NULL_POINTER; }
// initialize out param
*aCancel = false;
@ -3593,20 +3575,21 @@ nsHTMLEditRules::WillMakeBasicBlock(Selection* aSelection,
// if nothing visible in list, make an empty block
if (ListIsEmptyLine(arrayOfNodes))
{
nsCOMPtr<nsIDOMNode> parent, theBlock;
int32_t offset;
nsCOMPtr<nsIDOMNode> theBlock;
// get selection location
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetStartNodeAndOffset(aSelection, getter_AddRefs(parent), &offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(aSelection->RangeCount());
nsCOMPtr<nsINode> parent = aSelection->GetRangeAt(0)->GetStartParent();
int32_t offset = aSelection->GetRangeAt(0)->StartOffset();
NS_ENSURE_STATE(parent);
if (tString.EqualsLiteral("normal") ||
tString.IsEmpty() ) // we are removing blocks (going to "body text")
{
nsCOMPtr<nsIDOMNode> curBlock = parent;
nsCOMPtr<nsIDOMNode> curBlock = parent->AsDOMNode();
if (!IsBlockNode(curBlock)) {
NS_ENSURE_STATE(mHTMLEditor);
curBlock = mHTMLEditor->GetBlockNodeParent(parent);
curBlock = dont_AddRef(GetAsDOMNode(
mHTMLEditor->GetBlockNodeParent(parent).take()));
}
nsCOMPtr<nsIDOMNode> curBlockPar;
NS_ENSURE_TRUE(curBlock, NS_ERROR_NULL_POINTER);
@ -3617,7 +3600,8 @@ nsHTMLEditRules::WillMakeBasicBlock(Selection* aSelection,
// it gets pushed into a following block after the split, which is visually bad.
nsCOMPtr<nsIDOMNode> brNode;
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetNextHTMLNode(parent, offset, address_of(brNode));
res = mHTMLEditor->GetNextHTMLNode(parent->AsDOMNode(), offset,
address_of(brNode));
NS_ENSURE_SUCCESS(res, res);
if (brNode && nsTextEditUtils::IsBreak(brNode))
{
@ -3627,7 +3611,8 @@ nsHTMLEditRules::WillMakeBasicBlock(Selection* aSelection,
}
// do the splits!
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->SplitNodeDeep(curBlock, parent, offset, &offset, true);
res = mHTMLEditor->SplitNodeDeep(curBlock, parent->AsDOMNode(), offset,
&offset, true);
NS_ENSURE_SUCCESS(res, res);
// put a br at the split point
NS_ENSURE_STATE(mHTMLEditor);
@ -3645,7 +3630,8 @@ nsHTMLEditRules::WillMakeBasicBlock(Selection* aSelection,
// consume a br, if needed
nsCOMPtr<nsIDOMNode> brNode;
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetNextHTMLNode(parent, offset, address_of(brNode), true);
res = mHTMLEditor->GetNextHTMLNode(parent->AsDOMNode(), offset,
address_of(brNode), true);
NS_ENSURE_SUCCESS(res, res);
if (brNode && nsTextEditUtils::IsBreak(brNode))
{
@ -3656,11 +3642,12 @@ nsHTMLEditRules::WillMakeBasicBlock(Selection* aSelection,
arrayOfNodes.RemoveObject(brNode);
}
// make sure we can put a block here
res = SplitAsNeeded(aBlockType, address_of(parent), &offset);
res = SplitAsNeeded(*blockType, parent, offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(*aBlockType, parent, offset, getter_AddRefs(theBlock));
NS_ENSURE_SUCCESS(res, res);
theBlock = dont_AddRef(GetAsDOMNode(
mHTMLEditor->CreateNode(blockType, parent, offset).take()));
NS_ENSURE_STATE(theBlock);
// remember our new block for postprocessing
mNewBlock = theBlock;
// delete anything that was in the list of nodes
@ -3784,26 +3771,25 @@ nsHTMLEditRules::WillCSSIndent(Selection* aSelection,
NS_ENSURE_SUCCESS(res, res);
}
NS_NAMED_LITERAL_STRING(quoteType, "blockquote");
// if nothing visible in list, make an empty block
if (ListIsEmptyLine(arrayOfNodes))
{
nsCOMPtr<nsIDOMNode> parent, theBlock;
int32_t offset;
nsAutoString quoteType(NS_LITERAL_STRING("div"));
// get selection location
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetStartNodeAndOffset(aSelection, getter_AddRefs(parent), &offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(aSelection->RangeCount());
nsCOMPtr<nsINode> parent = aSelection->GetRangeAt(0)->GetStartParent();
int32_t offset = aSelection->GetRangeAt(0)->StartOffset();
NS_ENSURE_STATE(parent);
// make sure we can put a block here
res = SplitAsNeeded(&quoteType, address_of(parent), &offset);
res = SplitAsNeeded(*nsGkAtoms::div, parent, offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(quoteType, parent, offset, getter_AddRefs(theBlock));
NS_ENSURE_SUCCESS(res, res);
nsCOMPtr<Element> theBlock = mHTMLEditor->CreateNode(nsGkAtoms::div,
parent, offset);
NS_ENSURE_STATE(theBlock);
// remember our new block for postprocessing
mNewBlock = theBlock;
RelativeChangeIndentationOfElementNode(theBlock, +1);
mNewBlock = theBlock->AsDOMNode();
RelativeChangeIndentationOfElementNode(theBlock->AsDOMNode(), +1);
// delete anything that was in the list of nodes
for (int32_t j = arrayOfNodes.Count() - 1; j >= 0; --j)
{
@ -3883,14 +3869,9 @@ nsHTMLEditRules::WillCSSIndent(Selection* aSelection,
}
if (!curList || (sibling && sibling != curList)) {
nsAutoString listTag;
curParent->Tag()->ToString(listTag);
ToLowerCase(listTag);
// create a new nested list of correct type
nsCOMPtr<nsIDOMNode> curParentDOM = curParent->AsDOMNode();
res = SplitAsNeeded(&listTag, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*curParent->Tag(), curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curList = mHTMLEditor->CreateNode(curParent->Tag(), curParent, offset);
NS_ENSURE_STATE(curList);
@ -3920,11 +3901,8 @@ nsHTMLEditRules::WillCSSIndent(Selection* aSelection,
return NS_OK; // cancelled
}
nsCOMPtr<nsIDOMNode> curParentDOM = curParent->AsDOMNode();
res = SplitAsNeeded(&NS_LITERAL_STRING("div"),
address_of(curParentDOM), &offset);
res = SplitAsNeeded(*nsGkAtoms::div, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curQuote = mHTMLEditor->CreateNode(nsGkAtoms::div, curParent,
offset);
@ -3978,26 +3956,24 @@ nsHTMLEditRules::WillHTMLIndent(Selection* aSelection,
res = GetNodesForOperation(arrayOfRanges, arrayOfNodes, EditAction::indent);
NS_ENSURE_SUCCESS(res, res);
NS_NAMED_LITERAL_STRING(quoteType, "blockquote");
// if nothing visible in list, make an empty block
if (ListIsEmptyLine(arrayOfNodes))
{
nsCOMPtr<nsIDOMNode> parent, theBlock;
int32_t offset;
// get selection location
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetStartNodeAndOffset(aSelection, getter_AddRefs(parent), &offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(aSelection->RangeCount());
nsCOMPtr<nsINode> parent = aSelection->GetRangeAt(0)->GetStartParent();
int32_t offset = aSelection->GetRangeAt(0)->StartOffset();
NS_ENSURE_STATE(parent);
// make sure we can put a block here
res = SplitAsNeeded(&quoteType, address_of(parent), &offset);
res = SplitAsNeeded(*nsGkAtoms::blockquote, parent, offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(quoteType, parent, offset, getter_AddRefs(theBlock));
NS_ENSURE_SUCCESS(res, res);
nsCOMPtr<Element> theBlock = mHTMLEditor->CreateNode(nsGkAtoms::blockquote,
parent, offset);
NS_ENSURE_STATE(theBlock);
// remember our new block for postprocessing
mNewBlock = theBlock;
mNewBlock = theBlock->AsDOMNode();
// delete anything that was in the list of nodes
for (int32_t j = arrayOfNodes.Count() - 1; j >= 0; --j)
{
@ -4076,14 +4052,9 @@ nsHTMLEditRules::WillHTMLIndent(Selection* aSelection,
if (!curList || (sibling && sibling != curList) )
{
nsAutoString listTag;
curParent->Tag()->ToString(listTag);
ToLowerCase(listTag);
// create a new nested list of correct type
nsCOMPtr<nsIDOMNode> curParentDOM = curParent->AsDOMNode();
res = SplitAsNeeded(&listTag, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*curParent->Tag(), curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curList = mHTMLEditor->CreateNode(curParent->Tag(), curParent, offset);
NS_ENSURE_STATE(curList);
@ -4126,14 +4097,9 @@ nsHTMLEditRules::WillHTMLIndent(Selection* aSelection,
if (!curList || (sibling && sibling != curList) )
{
nsAutoString listTag;
curParent->Tag()->ToString(listTag);
ToLowerCase(listTag);
// create a new nested list of correct type
nsCOMPtr<nsIDOMNode> curParentDOM = curParent->AsDOMNode();
res = SplitAsNeeded(&listTag, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*curParent->Tag(), curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curList = mHTMLEditor->CreateNode(curParent->Tag(), curParent,
offset);
@ -4164,10 +4130,8 @@ nsHTMLEditRules::WillHTMLIndent(Selection* aSelection,
return NS_OK; // cancelled
}
nsCOMPtr<nsIDOMNode> curParentDOM = GetAsDOMNode(curParent);
res = SplitAsNeeded(&quoteType, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*nsGkAtoms::blockquote, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curQuote = mHTMLEditor->CreateNode(nsGkAtoms::blockquote, curParent,
offset);
@ -4868,18 +4832,21 @@ nsHTMLEditRules::WillAlign(Selection* aSelection,
}
if (emptyDiv)
{
int32_t offset;
nsCOMPtr<nsIDOMNode> brNode, parent, theDiv, sib;
nsCOMPtr<nsIDOMNode> brNode, sib;
NS_NAMED_LITERAL_STRING(divType, "div");
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetStartNodeAndOffset(aSelection, getter_AddRefs(parent), &offset);
NS_ENSURE_SUCCESS(res, res);
res = SplitAsNeeded(&divType, address_of(parent), &offset);
NS_ENSURE_STATE(aSelection->GetRangeAt(0));
nsCOMPtr<nsINode> parent = aSelection->GetRangeAt(0)->GetStartParent();
int32_t offset = aSelection->GetRangeAt(0)->StartOffset();
NS_ENSURE_STATE(parent);
res = SplitAsNeeded(*nsGkAtoms::div, parent, offset);
NS_ENSURE_SUCCESS(res, res);
// consume a trailing br, if any. This is to keep an alignment from
// creating extra lines, if possible.
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetNextHTMLNode(parent, offset, address_of(brNode));
res = mHTMLEditor->GetNextHTMLNode(parent->AsDOMNode(), offset,
address_of(brNode));
NS_ENSURE_SUCCESS(res, res);
if (brNode && nsTextEditUtils::IsBreak(brNode))
{
@ -4887,7 +4854,8 @@ nsHTMLEditRules::WillAlign(Selection* aSelection,
// we are putting our div is not a block, then the br we
// found is in same block we are, so its safe to consume it.
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetNextHTMLSibling(parent, offset, address_of(sib));
res = mHTMLEditor->GetNextHTMLSibling(parent->AsDOMNode(), offset,
address_of(sib));
NS_ENSURE_SUCCESS(res, res);
if (!IsBlockNode(sib))
{
@ -4897,17 +4865,18 @@ nsHTMLEditRules::WillAlign(Selection* aSelection,
}
}
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(divType, parent, offset, getter_AddRefs(theDiv));
NS_ENSURE_SUCCESS(res, res);
nsCOMPtr<Element> theDiv = mHTMLEditor->CreateNode(nsGkAtoms::div, parent,
offset);
NS_ENSURE_STATE(theDiv);
// remember our new block for postprocessing
mNewBlock = theDiv;
mNewBlock = theDiv->AsDOMNode();
// set up the alignment on the div, using HTML or CSS
nsCOMPtr<nsIDOMElement> divElem = do_QueryInterface(theDiv);
res = AlignBlock(divElem, alignType, true);
NS_ENSURE_SUCCESS(res, res);
*aHandled = true;
// put in a moz-br so that it won't get deleted
res = CreateMozBR(theDiv, 0);
res = CreateMozBR(theDiv->AsDOMNode(), 0);
NS_ENSURE_SUCCESS(res, res);
res = aSelection->Collapse(theDiv, 0);
selectionResetter.Abort(); // don't reset our selection in this case.
@ -5001,11 +4970,8 @@ nsHTMLEditRules::WillAlign(Selection* aSelection,
return NS_OK; // cancelled
}
nsCOMPtr<nsIDOMNode> curParentDOM = GetAsDOMNode(curParent);
res = SplitAsNeeded(&NS_LITERAL_STRING("div"), address_of(curParentDOM),
&offset);
res = SplitAsNeeded(*nsGkAtoms::div, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curDiv = mHTMLEditor->CreateNode(nsGkAtoms::div, curParent, offset);
NS_ENSURE_STATE(curDiv);
@ -7178,11 +7144,8 @@ nsHTMLEditRules::MakeBlockquote(nsCOMArray<nsIDOMNode>& arrayOfNodes)
// if no curBlock, make one
if (!curBlock)
{
nsCOMPtr<nsIDOMNode> curParentDOM = GetAsDOMNode(curParent);
res = SplitAsNeeded(&NS_LITERAL_STRING("blockquote"),
address_of(curParentDOM), &offset);
res = SplitAsNeeded(*nsGkAtoms::blockquote, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curBlock = mHTMLEditor->CreateNode(nsGkAtoms::blockquote, curParent,
offset);
@ -7400,17 +7363,14 @@ nsHTMLEditRules::ApplyBlockStyle(nsCOMArray<nsIDOMNode>& arrayOfNodes, const nsA
else
{
// make sure we can put a block here
nsCOMPtr<nsIDOMNode> curParentDOM = GetAsDOMNode(curParent);
res = SplitAsNeeded(aBlockTag, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*blockTag, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
nsCOMPtr<nsIDOMNode> theBlock;
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(*aBlockTag, GetAsDOMNode(curParent),
offset, getter_AddRefs(theBlock));
NS_ENSURE_SUCCESS(res, res);
nsCOMPtr<Element> theBlock =
mHTMLEditor->CreateNode(blockTag, curParent, offset);
NS_ENSURE_STATE(theBlock);
// remember our new block for postprocessing
mNewBlock = theBlock;
mNewBlock = theBlock->AsDOMNode();
}
}
@ -7428,10 +7388,8 @@ nsHTMLEditRules::ApplyBlockStyle(nsCOMArray<nsIDOMNode>& arrayOfNodes, const nsA
{
// the break is the first (or even only) node we encountered. Create a
// block for it.
nsCOMPtr<nsIDOMNode> curParentDOM = GetAsDOMNode(curParent);
res = SplitAsNeeded(aBlockTag, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*blockTag, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curBlock = mHTMLEditor->CreateNode(blockTag, curParent, offset);
NS_ENSURE_STATE(curBlock);
@ -7461,10 +7419,8 @@ nsHTMLEditRules::ApplyBlockStyle(nsCOMArray<nsIDOMNode>& arrayOfNodes, const nsA
// if no curBlock, make one
if (!curBlock)
{
nsCOMPtr<nsIDOMNode> curParentDOM = GetAsDOMNode(curParent);
res = SplitAsNeeded(aBlockTag, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*blockTag, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curBlock = mHTMLEditor->CreateNode(blockTag, curParent, offset);
NS_ENSURE_STATE(curBlock);
@ -7487,59 +7443,55 @@ nsHTMLEditRules::ApplyBlockStyle(nsCOMArray<nsIDOMNode>& arrayOfNodes, const nsA
}
///////////////////////////////////////////////////////////////////////////
// SplitAsNeeded: given a tag name, split inOutParent up to the point
// where we can insert the tag. Adjust inOutParent and
// inOutOffset to pint to new location for tag.
///////////////////////////////////////////////////////////////////////////////
// SplitAsNeeded: Given a tag name, split inOutParent up to the point where we
// can insert the tag. Adjust inOutParent and inOutOffset to
// point to new location for tag.
nsresult
nsHTMLEditRules::SplitAsNeeded(const nsAString *aTag,
nsCOMPtr<nsIDOMNode> *inOutParent,
int32_t *inOutOffset)
nsHTMLEditRules::SplitAsNeeded(nsIAtom& aTag,
nsCOMPtr<nsINode>& inOutParent,
int32_t& inOutOffset)
{
NS_ENSURE_TRUE(aTag && inOutParent && inOutOffset, NS_ERROR_NULL_POINTER);
NS_ENSURE_TRUE(*inOutParent, NS_ERROR_NULL_POINTER);
nsCOMPtr<nsIDOMNode> tagParent, temp, splitNode, parent = *inOutParent;
nsresult res = NS_OK;
nsCOMPtr<nsIAtom> tagAtom = do_GetAtom(*aTag);
NS_ENSURE_TRUE(inOutParent, NS_ERROR_NULL_POINTER);
// Check that we have a place that can legally contain the tag
nsCOMPtr<nsINode> tagParent, splitNode;
for (nsCOMPtr<nsINode> parent = inOutParent; parent;
parent = parent->GetParentNode()) {
// Sniffing up the parent tree until we find a legal place for the block
// check that we have a place that can legally contain the tag
while (!tagParent)
{
// sniffing up the parent tree until we find
// a legal place for the block
if (!parent) break;
// Don't leave the active editing host
NS_ENSURE_STATE(mHTMLEditor);
if (!mHTMLEditor->IsDescendantOfEditorRoot(parent)) {
nsCOMPtr<nsIContent> parentContent = do_QueryInterface(parent);
NS_ENSURE_STATE(mHTMLEditor);
if (parentContent != mHTMLEditor->GetActiveEditingHost()) {
break;
if (parent != mHTMLEditor->GetActiveEditingHost()) {
return NS_ERROR_FAILURE;
}
}
NS_ENSURE_STATE(mHTMLEditor);
if (mHTMLEditor->CanContainTag(parent, tagAtom)) {
if (mHTMLEditor->CanContainTag(parent->AsDOMNode(), &aTag)) {
// Success
tagParent = parent;
break;
}
splitNode = parent;
parent->GetParentNode(getter_AddRefs(temp));
parent = temp;
}
if (!tagParent)
{
// could not find a place to build tag!
if (!tagParent) {
// Could not find a place to build tag!
return NS_ERROR_FAILURE;
}
if (splitNode)
{
// we found a place for block, but above inOutParent. We need to split nodes.
if (splitNode) {
// We found a place for block, but above inOutParent. We need to split.
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->SplitNodeDeep(splitNode, *inOutParent, *inOutOffset, inOutOffset);
nsresult res = mHTMLEditor->SplitNodeDeep(splitNode->AsDOMNode(),
inOutParent->AsDOMNode(),
inOutOffset, &inOutOffset);
NS_ENSURE_SUCCESS(res, res);
*inOutParent = tagParent;
inOutParent = tagParent;
}
return res;
return NS_OK;
}
///////////////////////////////////////////////////////////////////////////
@ -9244,27 +9196,24 @@ nsHTMLEditRules::WillAbsolutePosition(Selection* aSelection,
EditAction::setAbsolutePosition);
NS_ENSURE_SUCCESS(res, res);
NS_NAMED_LITERAL_STRING(divType, "div");
// if nothing visible in list, make an empty block
if (ListIsEmptyLine(arrayOfNodes))
{
nsCOMPtr<nsIDOMNode> parent, thePositionedDiv;
int32_t offset;
// get selection location
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->GetStartNodeAndOffset(aSelection, getter_AddRefs(parent), &offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(aSelection->RangeCount());
nsCOMPtr<nsINode> parent = aSelection->GetRangeAt(0)->GetStartParent();
int32_t offset = aSelection->GetRangeAt(0)->StartOffset();
NS_ENSURE_STATE(parent);
// make sure we can put a block here
res = SplitAsNeeded(&divType, address_of(parent), &offset);
res = SplitAsNeeded(*nsGkAtoms::div, parent, offset);
NS_ENSURE_SUCCESS(res, res);
NS_ENSURE_STATE(mHTMLEditor);
res = mHTMLEditor->CreateNode(divType, parent, offset, getter_AddRefs(thePositionedDiv));
NS_ENSURE_SUCCESS(res, res);
nsCOMPtr<Element> thePositionedDiv =
mHTMLEditor->CreateNode(nsGkAtoms::div, parent, offset);
NS_ENSURE_STATE(thePositionedDiv);
// remember our new block for postprocessing
mNewBlock = thePositionedDiv;
mNewBlock = thePositionedDiv->AsDOMNode();
// delete anything that was in the list of nodes
for (int32_t j = arrayOfNodes.Count() - 1; j >= 0; --j)
{
@ -9313,14 +9262,9 @@ nsHTMLEditRules::WillAbsolutePosition(Selection* aSelection,
}
if (!curList || (sibling && sibling != GetAsDOMNode(curList))) {
nsAutoString listTag;
curParent->Tag()->ToString(listTag);
ToLowerCase(listTag);
// create a new nested list of correct type
nsCOMPtr<nsIDOMNode> curParentDOM = curParent->AsDOMNode();
res = SplitAsNeeded(&listTag, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*curParent->Tag(), curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
if (!curPositionedDiv) {
nsCOMPtr<nsINode> curParentParent = curParent->GetParentNode();
int32_t parentOffset = curParentParent
@ -9371,14 +9315,9 @@ nsHTMLEditRules::WillAbsolutePosition(Selection* aSelection,
}
if (!curList || (sibling && sibling != GetAsDOMNode(curList))) {
nsAutoString listTag;
curParent->Tag()->ToString(listTag);
ToLowerCase(listTag);
// create a new nested list of correct type
nsCOMPtr<nsIDOMNode> curParentDOM = curParent->AsDOMNode();
res = SplitAsNeeded(&listTag, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*curParent->Tag(), curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
if (!curPositionedDiv) {
nsCOMPtr<nsINode> curParentParent = curParent->GetParentNode();
int32_t parentOffset = curParentParent ?
@ -9413,10 +9352,8 @@ nsHTMLEditRules::WillAbsolutePosition(Selection* aSelection,
curList = nullptr;
continue;
}
nsCOMPtr<nsIDOMNode> curParentDOM = GetAsDOMNode(curParent);
res = SplitAsNeeded(&divType, address_of(curParentDOM), &offset);
res = SplitAsNeeded(*nsGkAtoms::div, curParent, offset);
NS_ENSURE_SUCCESS(res, res);
curParent = do_QueryInterface(curParentDOM);
NS_ENSURE_STATE(mHTMLEditor);
curPositionedDiv = mHTMLEditor->CreateNode(nsGkAtoms::div, curParent,
offset);

3
editor/libeditor/nsHTMLEditRules.h
Просмотреть файл

@ -286,7 +286,8 @@ protected:
nsresult RemoveBlockStyle(nsCOMArray<nsIDOMNode>& arrayOfNodes);
nsresult ApplyBlockStyle(nsCOMArray<nsIDOMNode>& arrayOfNodes, const nsAString *aBlockTag);
nsresult MakeBlockquote(nsCOMArray<nsIDOMNode>& arrayOfNodes);
nsresult SplitAsNeeded(const nsAString *aTag, nsCOMPtr<nsIDOMNode> *inOutParent, int32_t *inOutOffset);
nsresult SplitAsNeeded(nsIAtom& aTag, nsCOMPtr<nsINode>& inOutParent,
int32_t& inOutOffset);
nsresult AddTerminatingBR(nsIDOMNode *aBlock);
nsresult JoinNodesSmart( nsIDOMNode *aNodeLeft,
nsIDOMNode *aNodeRight,