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

Bug 1153629 part 10 - Clean up nsHTMLEditRules::AlignInnerBlocks; r=ehsan

Browse Source
This commit is contained in:
Aryeh Gregor 2015-04-24 14:27:35 +03:00
parent 78fd0e1b01
commit 7faae0a125
4 changed files with 21 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
editor/libeditor/nsEditorUtils.cpp
View File

@ -74,12 +74,10 @@ nsDOMIterator::nsDOMIterator(nsRange& aRange)
MOZ_ASSERT(NS_SUCCEEDED(res));
}
nsDOMIterator::nsDOMIterator(nsIDOMNode& aNode)
nsDOMIterator::nsDOMIterator(nsINode& aNode)
{
mIter = NS_NewContentIterator();
nsCOMPtr<nsINode> node = do_QueryInterface(&aNode);
NS_ENSURE_TRUE(node, );
DebugOnly<nsresult> res = mIter->Init(node);
DebugOnly<nsresult> res = mIter->Init(&aNode);
MOZ_ASSERT(NS_SUCCEEDED(res));
}

2
editor/libeditor/nsEditorUtils.h
View File

@ -178,7 +178,7 @@ class MOZ_STACK_CLASS nsDOMIterator
{
public:
explicit nsDOMIterator(nsRange& aRange);
explicit nsDOMIterator(nsIDOMNode& aNode);
explicit nsDOMIterator(nsINode& aNode);
virtual ~nsDOMIterator();
void AppendList(const nsBoolDomIterFunctor& functor,

41
editor/libeditor/nsHTMLEditRules.cpp
View File

@ -4806,7 +4806,7 @@ nsHTMLEditRules::WillAlign(Selection* aSelection,
else if (nsHTMLEditUtils::IsList(curParent)) {
// if we don't use CSS, add a contraint to list element : they have
// to be inside another list, ie >= second level of nesting
res = AlignInnerBlocks(curNode, alignType);
res = AlignInnerBlocks(*curContent, alignType);
NS_ENSURE_SUCCESS(res, res);
curDiv = 0;
continue;
@ -4849,34 +4849,27 @@ nsHTMLEditRules::WillAlign(Selection* aSelection,
}
///////////////////////////////////////////////////////////////////////////
// AlignInnerBlocks: align inside table cells or list items
//
///////////////////////////////////////////////////////////////////////////////
// AlignInnerBlocks: Align inside table cells or list items
//
nsresult
nsHTMLEditRules::AlignInnerBlocks(nsIDOMNode *aNode, const nsAString *alignType)
nsHTMLEditRules::AlignInnerBlocks(nsINode& aNode, const nsAString* alignType)
{
NS_ENSURE_TRUE(aNode && alignType, NS_ERROR_NULL_POINTER);
nsresult res;
// gather list of table cells or list items
nsCOMArray<nsIDOMNode> arrayOfNodes;
nsTableCellAndListItemFunctor functor;
nsDOMIterator iter(*aNode);
iter.AppendList(functor, arrayOfNodes);
// now that we have the list, align their contents as requested
int32_t listCount = arrayOfNodes.Count();
int32_t j;
NS_ENSURE_TRUE(alignType, NS_ERROR_NULL_POINTER);
for (j = 0; j < listCount; j++)
{
nsIDOMNode* node = arrayOfNodes[0];
res = AlignBlockContents(node, alignType);
// Gather list of table cells or list items
nsTArray<nsCOMPtr<nsINode>> nodeArray;
nsTableCellAndListItemFunctor functor;
nsDOMIterator iter(aNode);
iter.AppendList(functor, nodeArray);
// Now that we have the list, align their contents as requested
for (auto& node : nodeArray) {
nsresult res = AlignBlockContents(node->AsDOMNode(), alignType);
NS_ENSURE_SUCCESS(res, res);
arrayOfNodes.RemoveObjectAt(0);
}
return res;
return NS_OK;
}
@ -6134,7 +6127,7 @@ nsHTMLEditRules::BustUpInlinesAtBRs(nsINode& aNode,
// First build up a list of all the break nodes inside the inline container.
nsTArray<nsCOMPtr<nsINode>> arrayOfBreaks;
nsBRNodeFunctor functor;
nsDOMIterator iter(*GetAsDOMNode(&aNode));
nsDOMIterator iter(aNode);
iter.AppendList(functor, arrayOfBreaks);
// If there aren't any breaks, just put inNode itself in the array

2
editor/libeditor/nsHTMLEditRules.h
View File

@ -191,7 +191,7 @@ protected:
nsresult DidMakeBasicBlock(mozilla::dom::Selection* aSelection,
nsRulesInfo* aInfo, nsresult aResult);
nsresult DidAbsolutePosition();
nsresult AlignInnerBlocks(nsIDOMNode *aNode, const nsAString *alignType);
nsresult AlignInnerBlocks(nsINode& aNode, const nsAString* alignType);
nsresult AlignBlockContents(nsIDOMNode *aNode, const nsAString *alignType);
nsresult AppendInnerFormatNodes(nsTArray<nsCOMPtr<nsINode>>& aArray,
nsINode* aNode);