Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixing bug 230840. DeCOMtaminating nsIDocumentObserver, nsIAttribute, nsIContentList, and nsIContentIterator, and doing some other cleanup. r=jonas@sicking.cc, sr=bryner@brianryner.com

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@151784 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
jst%mozilla.jstenback.com
2004-01-24 00:46:17 +00:00
parent d107c96989
commit 12ed685455
57 changed files with 1892 additions and 2618 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
mozilla/layout/generic/nsSelection.cpp
View File

@@ -4933,45 +4933,49 @@ nsTypedSelection::selectFrames(nsIPresContext* aPresContext,
#endif //OLD_TABLE_SELECTION
}
// Now iterated through the child frames and set them
nsCOMPtr<nsIContent> innercontent;
while (NS_ENUMERATOR_FALSE == aInnerIter->IsDone())
while (!aInnerIter->IsDone())
{
result = aInnerIter->CurrentNode(getter_AddRefs(innercontent));
if (NS_SUCCEEDED(result) && innercontent)
nsIContent *innercontent = aInnerIter->GetCurrentNode();
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(innercontent, &frame);
if (NS_SUCCEEDED(result) && frame)
{
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(innercontent, &frame);
if (NS_SUCCEEDED(result) && frame)
//NOTE: eSpreadDown is now IGNORED. Selected state is set only
//for given frame
//spread from here to hit all frames in flow
frame->SetSelected(aPresContext, nsnull,aFlags,eSpreadDown);
nsRect frameRect = frame->GetRect();
//if a rect is 0 height/width then try to notify next
//available in flow of selection status.
while (!frameRect.width || !frameRect.height)
{
//NOTE: eSpreadDown is now IGNORED. Selected state is set only for given frame
frame->SetSelected(aPresContext, nsnull,aFlags,eSpreadDown);//spread from here to hit all frames in flow
nsRect frameRect = frame->GetRect();
//if a rect is 0 height/width then try to notify next available in flow of selection status.
while (!frameRect.width || !frameRect.height)
//try to notify next in flow that its content is selected.
if (NS_SUCCEEDED(frame->GetNextInFlow(&frame)) && frame)
{
//try to notify next in flow that its content is selected.
if (NS_SUCCEEDED(frame->GetNextInFlow(&frame)) && frame)
{
frameRect = frame->GetRect();
frame->SetSelected(aPresContext, nsnull,aFlags,eSpreadDown);
}
else
break;
frameRect = frame->GetRect();
frame->SetSelected(aPresContext, nsnull,aFlags,eSpreadDown);
}
//if the frame is splittable and this frame is 0,0 then set the next in flow frame to be selected also
else
break;
}
//if the frame is splittable and this frame is 0,0 then set
//the next in flow frame to be selected also
}
result = aInnerIter->Next();
if (NS_FAILED(result))
return result;
aInnerIter->Next();
}
#if 0
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(content, &frame);
if (NS_SUCCEEDED(result) && frame)
frame->SetSelected(aRange,aFlags,eSpreadDown);//spread from here to hit all frames in flow
#endif
return NS_OK;
}
return NS_ERROR_FAILURE;
}
@@ -5034,14 +5038,15 @@ nsTypedSelection::selectFrames(nsIPresContext* aPresContext, nsIDOMRange *aRange
frame->SetSelected(aPresContext, aRange,aFlags,eSpreadDown);//spread from here to hit all frames in flow
}
//end start content
result = iter->First();
while (NS_SUCCEEDED(result) && NS_ENUMERATOR_FALSE == iter->IsDone())
iter->First();
while (!iter->IsDone())
{
result = iter->CurrentNode(getter_AddRefs(content));
if (NS_FAILED(result) || !content)
return result;
content = iter->GetCurrentNode();
selectFrames(aPresContext, inneriter, content, aRange, presShell,aFlags);
result = iter->Next();
iter->Next();
}
//we must now do the last one if it is not the same as the first
if (FetchEndParent(aRange) != FetchStartParent(aRange))