Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make nsIFrame::DisplaySelectionOverlay take an nsDisplayList* instead of nsDisplayListSet&. (Bug 485501) r=roc a2.0=blocking:beta6

Browse Source
This commit is contained in:
L. David Baron 2010-09-09 08:21:46 -07:00
parent 9eb3bf0d24
commit 977bd2e2c8
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
layout/forms/nsComboboxControlFrame.cpp
View File

@ -1375,7 +1375,7 @@ nsComboboxControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
}
return DisplaySelectionOverlay(aBuilder, aLists);
return DisplaySelectionOverlay(aBuilder, aLists.Content());
}
void nsComboboxControlFrame::PaintFocus(nsIRenderingContext& aRenderingContext,

2
layout/forms/nsFileControlFrame.cpp
View File

@ -686,7 +686,7 @@ nsFileControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
return rv;
}
return DisplaySelectionOverlay(aBuilder, aLists);
return DisplaySelectionOverlay(aBuilder, aLists.Content());
}
#ifdef ACCESSIBILITY

2
layout/forms/nsHTMLButtonControlFrame.cpp
View File

@ -193,7 +193,7 @@ nsHTMLButtonControlFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
NS_ENSURE_SUCCESS(rv, rv);
// to draw border when selected in editor
return DisplaySelectionOverlay(aBuilder, aLists);
return DisplaySelectionOverlay(aBuilder, aLists.Content());
}
nscoord

4
layout/generic/nsFrame.cpp
View File

@ -1011,7 +1011,7 @@ void nsDisplaySelectionOverlay::Paint(nsDisplayListBuilder* aBuilder,
nsresult
nsFrame::DisplaySelectionOverlay(nsDisplayListBuilder* aBuilder,
const nsDisplayListSet& aLists,
nsDisplayList* aList,
PRUint16 aContentType)
{
//check frame selection state
@ -1058,7 +1058,7 @@ nsFrame::DisplaySelectionOverlay(nsDisplayListBuilder* aBuilder,
details = next;
}
return aLists.Content()->AppendNewToTop(new (aBuilder)
return aList->AppendNewToTop(new (aBuilder)
nsDisplaySelectionOverlay(aBuilder, this, selectionValue));
}

2
layout/generic/nsFrame.h
View File

@ -549,7 +549,7 @@ protected:
* which kind of content this is for
*/
nsresult DisplaySelectionOverlay(nsDisplayListBuilder* aBuilder,
const nsDisplayListSet& aLists, PRUint16 aContentType = nsISelectionDisplay::DISPLAY_FRAMES);
nsDisplayList* aList, PRUint16 aContentType = nsISelectionDisplay::DISPLAY_FRAMES);
PRInt16 DisplaySelection(nsPresContext* aPresContext, PRBool isOkToTurnOn = PR_FALSE);

2
layout/generic/nsHTMLCanvasFrame.cpp
View File

@ -287,7 +287,7 @@ nsHTMLCanvasFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
new (aBuilder) nsDisplayCanvas(aBuilder, this));
NS_ENSURE_SUCCESS(rv, rv);
return DisplaySelectionOverlay(aBuilder, aLists,
return DisplaySelectionOverlay(aBuilder, aLists.Content(),
nsISelectionDisplay::DISPLAY_IMAGES);
}

2
layout/generic/nsImageFrame.cpp
View File

@ -1357,7 +1357,7 @@ nsImageFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
}
#endif
return DisplaySelectionOverlay(aBuilder, aLists,
return DisplaySelectionOverlay(aBuilder, aLists.Content(),
nsISelectionDisplay::DISPLAY_IMAGES);
}

2
layout/generic/nsInlineFrame.cpp
View File

@ -194,7 +194,7 @@ nsInlineFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
// normally don't have any size, but in Editor we use CSS to display
// an image to represent this "hidden" element.
if (!mFrames.FirstChild()) {
rv = DisplaySelectionOverlay(aBuilder, aLists);
rv = DisplaySelectionOverlay(aBuilder, aLists.Content());
}
return rv;
}

2
layout/xul/base/src/nsBoxFrame.cpp
View File

@ -1334,7 +1334,7 @@ nsBoxFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
NS_ENSURE_SUCCESS(rv, rv);
// see if we have to draw a selection frame around this container
rv = DisplaySelectionOverlay(aBuilder, destination);
rv = DisplaySelectionOverlay(aBuilder, destination.Content());
NS_ENSURE_SUCCESS(rv, rv);
if (forceLayer) {