Bug 950467, part 3 - Remove the unused aFrame param from nsFontFaceList::AddFontsFromTextRun. r=roc

This commit is contained in:
Mats Palmgren 2013-12-18 13:25:54 +00:00
parent 60fdccfb9c
commit 8b36172edd
3 changed files with 3 additions and 9 deletions

View File

@ -5198,10 +5198,7 @@ nsLayoutUtils::GetFontFacesForText(nsIFrame* aFrame,
uint32_t skipStart = iter.ConvertOriginalToSkipped(fstart); uint32_t skipStart = iter.ConvertOriginalToSkipped(fstart);
uint32_t skipEnd = iter.ConvertOriginalToSkipped(fend); uint32_t skipEnd = iter.ConvertOriginalToSkipped(fend);
aFontFaceList->AddFontsFromTextRun(textRun, aFontFaceList->AddFontsFromTextRun(textRun, skipStart, skipEnd - skipStart);
skipStart,
skipEnd - skipStart,
curr);
curr = next; curr = next;
} while (aFollowContinuations && curr); } while (aFollowContinuations && curr);

View File

@ -71,8 +71,7 @@ nsFontFaceList::GetLength(uint32_t *aLength)
nsresult nsresult
nsFontFaceList::AddFontsFromTextRun(gfxTextRun* aTextRun, nsFontFaceList::AddFontsFromTextRun(gfxTextRun* aTextRun,
uint32_t aOffset, uint32_t aLength, uint32_t aOffset, uint32_t aLength)
nsIFrame* aFrame)
{ {
gfxTextRun::GlyphRunIterator iter(aTextRun, aOffset, aLength); gfxTextRun::GlyphRunIterator iter(aTextRun, aOffset, aLength);
while (iter.NextRun()) { while (iter.NextRun()) {

View File

@ -13,7 +13,6 @@
class gfxFontEntry; class gfxFontEntry;
class gfxTextRun; class gfxTextRun;
class nsIFrame;
class nsFontFaceList : public nsIDOMFontFaceList class nsFontFaceList : public nsIDOMFontFaceList
{ {
@ -25,8 +24,7 @@ public:
virtual ~nsFontFaceList(); virtual ~nsFontFaceList();
nsresult AddFontsFromTextRun(gfxTextRun* aTextRun, nsresult AddFontsFromTextRun(gfxTextRun* aTextRun,
uint32_t aOffset, uint32_t aLength, uint32_t aOffset, uint32_t aLength);
nsIFrame* aFrame);
protected: protected:
nsInterfaceHashtable<nsPtrHashKey<gfxFontEntry>,nsIDOMFontFace> mFontFaces; nsInterfaceHashtable<nsPtrHashKey<gfxFontEntry>,nsIDOMFontFace> mFontFaces;