зеркало из https://github.com/mozilla/gecko-dev.git
Bug 748646 patch 2: Remove no-longer-needed parameter aLists from a few TextOverflow functions. r=mats
This commit is contained in:
Родитель
3232915300
Коммит
c3ebc87501
|
@ -221,7 +221,6 @@ nsDisplayTextOverflowMarker::PaintTextToContext(nsRenderingContext* aCtx,
|
|||
|
||||
void
|
||||
TextOverflow::Init(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayListSet& aLists,
|
||||
nsIFrame* aBlockFrame)
|
||||
{
|
||||
mBuilder = aBuilder;
|
||||
|
@ -267,14 +266,13 @@ TextOverflow::Init(nsDisplayListBuilder* aBuilder,
|
|||
|
||||
/* static */ TextOverflow*
|
||||
TextOverflow::WillProcessLines(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayListSet& aLists,
|
||||
nsIFrame* aBlockFrame)
|
||||
{
|
||||
if (!CanHaveTextOverflow(aBuilder, aBlockFrame)) {
|
||||
return nsnull;
|
||||
}
|
||||
nsAutoPtr<TextOverflow> textOverflow(new TextOverflow);
|
||||
textOverflow->Init(aBuilder, aLists, aBlockFrame);
|
||||
textOverflow->Init(aBuilder, aBlockFrame);
|
||||
return textOverflow.forget();
|
||||
}
|
||||
|
||||
|
|
|
@ -29,7 +29,6 @@ class TextOverflow {
|
|||
* @return nsnull if no processing is necessary. The caller owns the object.
|
||||
*/
|
||||
static TextOverflow* WillProcessLines(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayListSet& aLists,
|
||||
nsIFrame* aBlockFrame);
|
||||
/**
|
||||
* Analyze the display lists for text overflow and what kind of item is at
|
||||
|
@ -55,7 +54,6 @@ class TextOverflow {
|
|||
protected:
|
||||
TextOverflow() {}
|
||||
void Init(nsDisplayListBuilder* aBuilder,
|
||||
const nsDisplayListSet& aLists,
|
||||
nsIFrame* aBlockFrame);
|
||||
|
||||
struct AlignmentEdges {
|
||||
|
|
|
@ -6267,7 +6267,7 @@ nsBlockFrame::BuildDisplayList(nsDisplayListBuilder* aBuilder,
|
|||
|
||||
// Prepare for text-overflow processing.
|
||||
nsAutoPtr<TextOverflow> textOverflow(
|
||||
TextOverflow::WillProcessLines(aBuilder, aLists, this));
|
||||
TextOverflow::WillProcessLines(aBuilder, this));
|
||||
|
||||
// We'll collect our lines' display items here, & then append this to aLists.
|
||||
nsDisplayListCollection linesDisplayListCollection;
|
||||
|
|
Загрузка…
Ссылка в новой задаче