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

Speeding up retrieval of anonymous nodes by removing a redundant copy. 

a=ben@netscape.com
This commit is contained in:
hyatt%netscape.com 2000-12-10 09:21:22 +00:00
Родитель d10778f295
Коммит 6f07d37bf0
2 изменённых файлов: 22 добавлений и 18 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

20
layout/base/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -5356,7 +5356,7 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsIPresShell* aPresShell,
return rv; return rv;
// Retrieve the anonymous content that we should build. // Retrieve the anonymous content that we should build.
nsCOMPtr<nsISupportsArray> anonymousItems; nsCOMPtr<nsIDOMNodeList> anonymousItems;
nsCOMPtr<nsIContent> childElement; nsCOMPtr<nsIContent> childElement;
PRBool multiple; PRBool multiple;
xblService->GetContentList(aParent, getter_AddRefs(anonymousItems), getter_AddRefs(childElement), &multiple); xblService->GetContentList(aParent, getter_AddRefs(anonymousItems), getter_AddRefs(childElement), &multiple);
@ -5375,16 +5375,17 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsIPresShell* aPresShell,
// Build the frames for the anonymous content. // Build the frames for the anonymous content.
PRUint32 count = 0; PRUint32 count = 0;
anonymousItems->Count(&count); anonymousItems->GetLength(&count);
for (PRUint32 i=0; i < count; i++) for (PRUint32 i=0; i < count; i++)
{ {
// get our child's content and set its parent to our content // get our child's content and set its parent to our content
nsCOMPtr<nsIContent> content; nsCOMPtr<nsIDOMNode> elt;
if (NS_FAILED(anonymousItems->QueryElementAt(i, NS_GET_IID(nsIContent), getter_AddRefs(content)))) if (NS_FAILED(anonymousItems->Item(i, getter_AddRefs(elt))))
continue; continue;
// create the frame and attach it to our frame // create the frame and attach it to our frame
nsCOMPtr<nsIContent> content(do_QueryInterface(elt));
ConstructFrame(aPresShell, aPresContext, aState, content, aNewFrame, aChildItems); ConstructFrame(aPresShell, aPresContext, aState, content, aNewFrame, aChildItems);
} }
@ -5605,7 +5606,7 @@ nsCSSFrameConstructor::CreateAnonymousTableCellFrames(nsIPresShell* aPres
// Retrieve the anonymous content that we should build. // Retrieve the anonymous content that we should build.
nsCOMPtr<nsIContent> childElement; nsCOMPtr<nsIContent> childElement;
nsCOMPtr<nsISupportsArray> anonymousItems; nsCOMPtr<nsIDOMNodeList> anonymousItems;
PRBool multiple; PRBool multiple;
xblService->GetContentList(aParent, getter_AddRefs(anonymousItems), getter_AddRefs(childElement), &multiple); xblService->GetContentList(aParent, getter_AddRefs(anonymousItems), getter_AddRefs(childElement), &multiple);
@ -5614,16 +5615,17 @@ nsCSSFrameConstructor::CreateAnonymousTableCellFrames(nsIPresShell* aPres
// Build the frames for the anonymous content. // Build the frames for the anonymous content.
PRUint32 count = 0; PRUint32 count = 0;
anonymousItems->Count(&count); anonymousItems->GetLength(&count);
for (PRUint32 i=0; i < count; i++) for (PRUint32 i=0; i < count; i++)
{ {
// get our child's content and set its parent to our content // get our child's content and set its parent to our content
nsCOMPtr<nsIContent> content; nsCOMPtr<nsIDOMNode> elt;
if (NS_FAILED(anonymousItems->QueryElementAt(i, NS_GET_IID(nsIContent), getter_AddRefs(content)))) if (NS_FAILED(anonymousItems->Item(i, getter_AddRefs(elt))))
continue; continue;
// create the frame and attach it to our frame // create the frame and attach it to our frame
nsCOMPtr<nsIContent> content(do_QueryInterface(elt));
ConstructFrame(aPresShell, aPresContext, aState, content, aNewFrame, aChildItems); ConstructFrame(aPresShell, aPresContext, aState, content, aNewFrame, aChildItems);
} }

20
layout/html/style/src/nsCSSFrameConstructor.cpp
Просмотреть файл

@ -5356,7 +5356,7 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsIPresShell* aPresShell,
return rv; return rv;
// Retrieve the anonymous content that we should build. // Retrieve the anonymous content that we should build.
nsCOMPtr<nsISupportsArray> anonymousItems; nsCOMPtr<nsIDOMNodeList> anonymousItems;
nsCOMPtr<nsIContent> childElement; nsCOMPtr<nsIContent> childElement;
PRBool multiple; PRBool multiple;
xblService->GetContentList(aParent, getter_AddRefs(anonymousItems), getter_AddRefs(childElement), &multiple); xblService->GetContentList(aParent, getter_AddRefs(anonymousItems), getter_AddRefs(childElement), &multiple);
@ -5375,16 +5375,17 @@ nsCSSFrameConstructor::CreateAnonymousFrames(nsIPresShell* aPresShell,
// Build the frames for the anonymous content. // Build the frames for the anonymous content.
PRUint32 count = 0; PRUint32 count = 0;
anonymousItems->Count(&count); anonymousItems->GetLength(&count);
for (PRUint32 i=0; i < count; i++) for (PRUint32 i=0; i < count; i++)
{ {
// get our child's content and set its parent to our content // get our child's content and set its parent to our content
nsCOMPtr<nsIContent> content; nsCOMPtr<nsIDOMNode> elt;
if (NS_FAILED(anonymousItems->QueryElementAt(i, NS_GET_IID(nsIContent), getter_AddRefs(content)))) if (NS_FAILED(anonymousItems->Item(i, getter_AddRefs(elt))))
continue; continue;
// create the frame and attach it to our frame // create the frame and attach it to our frame
nsCOMPtr<nsIContent> content(do_QueryInterface(elt));
ConstructFrame(aPresShell, aPresContext, aState, content, aNewFrame, aChildItems); ConstructFrame(aPresShell, aPresContext, aState, content, aNewFrame, aChildItems);
} }
@ -5605,7 +5606,7 @@ nsCSSFrameConstructor::CreateAnonymousTableCellFrames(nsIPresShell* aPres
// Retrieve the anonymous content that we should build. // Retrieve the anonymous content that we should build.
nsCOMPtr<nsIContent> childElement; nsCOMPtr<nsIContent> childElement;
nsCOMPtr<nsISupportsArray> anonymousItems; nsCOMPtr<nsIDOMNodeList> anonymousItems;
PRBool multiple; PRBool multiple;
xblService->GetContentList(aParent, getter_AddRefs(anonymousItems), getter_AddRefs(childElement), &multiple); xblService->GetContentList(aParent, getter_AddRefs(anonymousItems), getter_AddRefs(childElement), &multiple);
@ -5614,16 +5615,17 @@ nsCSSFrameConstructor::CreateAnonymousTableCellFrames(nsIPresShell* aPres
// Build the frames for the anonymous content. // Build the frames for the anonymous content.
PRUint32 count = 0; PRUint32 count = 0;
anonymousItems->Count(&count); anonymousItems->GetLength(&count);
for (PRUint32 i=0; i < count; i++) for (PRUint32 i=0; i < count; i++)
{ {
// get our child's content and set its parent to our content // get our child's content and set its parent to our content
nsCOMPtr<nsIContent> content; nsCOMPtr<nsIDOMNode> elt;
if (NS_FAILED(anonymousItems->QueryElementAt(i, NS_GET_IID(nsIContent), getter_AddRefs(content)))) if (NS_FAILED(anonymousItems->Item(i, getter_AddRefs(elt))))
continue; continue;
// create the frame and attach it to our frame // create the frame and attach it to our frame
nsCOMPtr<nsIContent> content(do_QueryInterface(elt));
ConstructFrame(aPresShell, aPresContext, aState, content, aNewFrame, aChildItems); ConstructFrame(aPresShell, aPresContext, aState, content, aNewFrame, aChildItems);
} }