Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-15 19:20:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

bug fix for mjudges bug #45387

Browse Source 
r=anthonyd
This commit is contained in:
anthonyd%netscape.com 2000-09-13 00:05:29 +00:00
parent 861c2cc6cb
commit 408d1057ca
5 changed files with 29 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
content/base/src/nsSelection.cpp
View File

@ -3694,12 +3694,13 @@ nsDOMSelection::selectFrames(nsIPresContext* aPresContext,
while (NS_ENUMERATOR_FALSE == aInnerIter->IsDone())
{
result = aInnerIter->CurrentNode(getter_AddRefs(innercontent));
if (NS_FAILED(result) || !innercontent)
continue;
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(innercontent, &frame);
if (NS_SUCCEEDED(result) && frame)
//NOTE: aRange and eSpreadDown are now IGNORED. Selected state is set only for given frame
frame->SetSelected(aPresContext, aRange,aFlags,eSpreadDown);//spread from here to hit all frames in flow
if (NS_SUCCEEDED(result) && innercontent)
{
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(innercontent, &frame);
if (NS_SUCCEEDED(result) && frame)
//NOTE: aRange and eSpreadDown are now IGNORED. Selected state is set only for given frame
frame->SetSelected(aPresContext, aRange,aFlags,eSpreadDown);//spread from here to hit all frames in flow
}
result = aInnerIter->Next();
if (NS_FAILED(result))
return result;

4
layout/base/nsCSSFrameConstructor.cpp
View File

@ -1187,6 +1187,10 @@ NS_NewGeneratedContentIterator(nsIPresContext* aPresContext,
if (!aIterator) {
return NS_ERROR_NULL_POINTER;
}
NS_ENSURE_ARG_POINTER(aFrame);
if (!aFrame) {
return NS_ERROR_NULL_POINTER;
}
// Make sure the frame corresponds to generated content
#ifdef DEBUG

13
layout/base/src/nsSelection.cpp
View File

@ -3694,12 +3694,13 @@ nsDOMSelection::selectFrames(nsIPresContext* aPresContext,
while (NS_ENUMERATOR_FALSE == aInnerIter->IsDone())
{
result = aInnerIter->CurrentNode(getter_AddRefs(innercontent));
if (NS_FAILED(result) || !innercontent)
continue;
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(innercontent, &frame);
if (NS_SUCCEEDED(result) && frame)
//NOTE: aRange and eSpreadDown are now IGNORED. Selected state is set only for given frame
frame->SetSelected(aPresContext, aRange,aFlags,eSpreadDown);//spread from here to hit all frames in flow
if (NS_SUCCEEDED(result) && innercontent)
{
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(innercontent, &frame);
if (NS_SUCCEEDED(result) && frame)
//NOTE: aRange and eSpreadDown are now IGNORED. Selected state is set only for given frame
frame->SetSelected(aPresContext, aRange,aFlags,eSpreadDown);//spread from here to hit all frames in flow
}
result = aInnerIter->Next();
if (NS_FAILED(result))
return result;

13
layout/generic/nsSelection.cpp
View File

@ -3694,12 +3694,13 @@ nsDOMSelection::selectFrames(nsIPresContext* aPresContext,
while (NS_ENUMERATOR_FALSE == aInnerIter->IsDone())
{
result = aInnerIter->CurrentNode(getter_AddRefs(innercontent));
if (NS_FAILED(result) || !innercontent)
continue;
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(innercontent, &frame);
if (NS_SUCCEEDED(result) && frame)
//NOTE: aRange and eSpreadDown are now IGNORED. Selected state is set only for given frame
frame->SetSelected(aPresContext, aRange,aFlags,eSpreadDown);//spread from here to hit all frames in flow
if (NS_SUCCEEDED(result) && innercontent)
{
result = mFrameSelection->GetTracker()->GetPrimaryFrameFor(innercontent, &frame);
if (NS_SUCCEEDED(result) && frame)
//NOTE: aRange and eSpreadDown are now IGNORED. Selected state is set only for given frame
frame->SetSelected(aPresContext, aRange,aFlags,eSpreadDown);//spread from here to hit all frames in flow
}
result = aInnerIter->Next();
if (NS_FAILED(result))
return result;

4
layout/html/style/src/nsCSSFrameConstructor.cpp
View File

@ -1187,6 +1187,10 @@ NS_NewGeneratedContentIterator(nsIPresContext* aPresContext,
if (!aIterator) {
return NS_ERROR_NULL_POINTER;
}
NS_ENSURE_ARG_POINTER(aFrame);
if (!aFrame) {
return NS_ERROR_NULL_POINTER;
}
// Make sure the frame corresponds to generated content
#ifdef DEBUG