Bug 950467, part 3 - Remove the unused aFrame param from nsFontFaceList::AddFontsFromTextRun. r=roc
--- a/layout/base/nsLayoutUtils.cpp
+++ b/layout/base/nsLayoutUtils.cpp
@@ -5193,20 +5193,17 @@ nsLayoutUtils::GetFontFacesForText(nsIFr
fend = std::min(next->GetContentEnd(), aEndOffset);
next = fend < aEndOffset ?
static_cast<nsTextFrame*>(next->GetNextContinuation()) : nullptr;
}
}
uint32_t skipStart = iter.ConvertOriginalToSkipped(fstart);
uint32_t skipEnd = iter.ConvertOriginalToSkipped(fend);
- aFontFaceList->AddFontsFromTextRun(textRun,
- skipStart,
- skipEnd - skipStart,
- curr);
+ aFontFaceList->AddFontsFromTextRun(textRun, skipStart, skipEnd - skipStart);
curr = next;
} while (aFollowContinuations && curr);
return NS_OK;
}
/* static */
size_t
--- a/layout/inspector/nsFontFaceList.cpp
+++ b/layout/inspector/nsFontFaceList.cpp
@@ -66,18 +66,17 @@ nsFontFaceList::GetLength(uint32_t *aLen
return NS_OK;
}
////////////////////////////////////////////////////////////////////////
// nsFontFaceList
nsresult
nsFontFaceList::AddFontsFromTextRun(gfxTextRun* aTextRun,
- uint32_t aOffset, uint32_t aLength,
- nsIFrame* aFrame)
+ uint32_t aOffset, uint32_t aLength)
{
gfxTextRun::GlyphRunIterator iter(aTextRun, aOffset, aLength);
while (iter.NextRun()) {
gfxFontEntry *fe = iter.GetGlyphRun()->mFont->GetFontEntry();
// if we have already listed this face, just make sure the match type is
// recorded
nsFontFace* existingFace =
static_cast<nsFontFace*>(mFontFaces.GetWeak(fe));
--- a/layout/inspector/nsFontFaceList.h
+++ b/layout/inspector/nsFontFaceList.h
@@ -8,28 +8,26 @@
#include "nsIDOMFontFaceList.h"
#include "nsIDOMFontFace.h"
#include "nsCOMPtr.h"
#include "nsInterfaceHashtable.h"
#include "nsHashKeys.h"
class gfxFontEntry;
class gfxTextRun;
-class nsIFrame;
class nsFontFaceList : public nsIDOMFontFaceList
{
public:
NS_DECL_ISUPPORTS
NS_DECL_NSIDOMFONTFACELIST
nsFontFaceList();
virtual ~nsFontFaceList();
nsresult AddFontsFromTextRun(gfxTextRun* aTextRun,
- uint32_t aOffset, uint32_t aLength,
- nsIFrame* aFrame);
+ uint32_t aOffset, uint32_t aLength);
protected:
nsInterfaceHashtable<nsPtrHashKey<gfxFontEntry>,nsIDOMFontFace> mFontFaces;
};
#endif // __nsFontFaceList_h__