зеркало из https://github.com/mozilla/gecko-dev.git
Renaming GetDocShellChildren() to GetDocShellChildCount(). See bug 98158 for details.
This commit is contained in:
Родитель
e02a57d005
Коммит
291ee4a44f
|
@ -90,7 +90,7 @@ public:
|
|||
NS_IMETHOD GetDocShell(nsIDocShell **aDocShell);
|
||||
NS_IMETHOD Destroy();
|
||||
|
||||
PRInt32 GetDocShellChildren(nsIDocShellTreeNode *aParentNode);
|
||||
PRInt32 GetDocShellChildCount(nsIDocShellTreeNode *aParentNode);
|
||||
|
||||
protected:
|
||||
nsresult GetPresContext(nsIPresContext **aPresContext);
|
||||
|
@ -279,7 +279,7 @@ nsFrameLoader::Destroy()
|
|||
* Count the total number of docshell children in each page.
|
||||
*/
|
||||
PRInt32
|
||||
nsFrameLoader::GetDocShellChildren(nsIDocShellTreeNode* aParentNode)
|
||||
nsFrameLoader::GetDocShellChildCount(nsIDocShellTreeNode* aParentNode)
|
||||
{
|
||||
PRInt32 retval = 1;
|
||||
|
||||
|
@ -291,7 +291,7 @@ nsFrameLoader::GetDocShellChildren(nsIDocShellTreeNode* aParentNode)
|
|||
nsCOMPtr<nsIDocShellTreeItem> child;
|
||||
aParentNode->GetChildAt(i,getter_AddRefs(child));
|
||||
nsCOMPtr<nsIDocShellTreeNode> childAsNode(do_QueryInterface(child));
|
||||
retval += GetDocShellChildren(childAsNode);
|
||||
retval += GetDocShellChildCount(childAsNode);
|
||||
}
|
||||
|
||||
return retval;
|
||||
|
@ -380,7 +380,7 @@ nsFrameLoader::EnsureDocShell()
|
|||
nsCOMPtr<nsIDocShellTreeNode> rootNode(do_QueryInterface(root));
|
||||
|
||||
PRInt32 childrenCount;
|
||||
childrenCount = GetDocShellChildren(rootNode);
|
||||
childrenCount = GetDocShellChildCount(rootNode);
|
||||
|
||||
if(childrenCount >= MAX_NUMBER_DOCSHELLS) {
|
||||
NS_WARNING("Too many docshell (recursion?) so giving up");
|
||||
|
|
Загрузка…
Ссылка в новой задаче