diff --git a/dom/base/nsIDocument.h b/dom/base/nsIDocument.h index 297a207fcb..5ccb18f780 100644 --- a/dom/base/nsIDocument.h +++ b/dom/base/nsIDocument.h @@ -1153,11 +1153,13 @@ public: * sheets for this document, returns the index that aSheet should * be inserted at to maintain document ordering. * + * Type T has to cast to StyleSheet*. + * * Defined in nsIDocumentInlines.h. */ template - size_t FindDocStyleSheetInsertionPoint(const nsTArray>& aDocSheets, - T* aSheet); + size_t FindDocStyleSheetInsertionPoint(const nsTArray& aDocSheets, + mozilla::StyleSheet* aSheet); /** * Get this document's CSSLoader. This is guaranteed to not return null. diff --git a/dom/base/nsIDocumentInlines.h b/dom/base/nsIDocumentInlines.h index 4ba21dfe64..708a1ae91f 100644 --- a/dom/base/nsIDocumentInlines.h +++ b/dom/base/nsIDocumentInlines.h @@ -19,8 +19,8 @@ nsIDocument::GetBodyElement() template size_t nsIDocument::FindDocStyleSheetInsertionPoint( - const nsTArray>& aDocSheets, - T* aSheet) + const nsTArray& aDocSheets, + mozilla::StyleSheet* aSheet) { nsStyleSheetService* sheetService = nsStyleSheetService::GetInstance(); @@ -30,13 +30,12 @@ nsIDocument::FindDocStyleSheetInsertionPoint( int32_t count = aDocSheets.Length(); int32_t index; for (index = 0; index < count; index++) { - T* sheet = aDocSheets[index]; + mozilla::StyleSheet* sheet = static_cast( + aDocSheets[index]); int32_t sheetDocIndex = GetIndexOfStyleSheet(sheet); if (sheetDocIndex > newDocIndex) break; - mozilla::StyleSheet* sheetHandle = sheet; - // If the sheet is not owned by the document it can be an author // sheet registered at nsStyleSheetService or an additional author // sheet on the document, which means the new @@ -44,11 +43,11 @@ nsIDocument::FindDocStyleSheetInsertionPoint( if (sheetDocIndex < 0) { if (sheetService) { auto& authorSheets = *sheetService->AuthorStyleSheets(); - if (authorSheets.IndexOf(sheetHandle) != authorSheets.NoIndex) { + if (authorSheets.IndexOf(sheet) != authorSheets.NoIndex) { break; } } - if (sheetHandle == GetFirstAdditionalAuthorSheet()) { + if (sheet == GetFirstAdditionalAuthorSheet()) { break; } }