From 9e5e58c0f6e1c65674cc688816f387532661d6f1 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 17 Apr 2020 07:42:07 -0400 Subject: Bug 1425769 - Base class for ShadowRoot and Document to manage style state Tag #1375 --- layout/inspector/inDOMUtils.cpp | 4 ++-- layout/style/Loader.cpp | 4 ++-- layout/style/ServoStyleSet.cpp | 2 +- layout/style/nsStyleSet.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'layout') diff --git a/layout/inspector/inDOMUtils.cpp b/layout/inspector/inDOMUtils.cpp index 8e547cc24..58afc5f76 100644 --- a/layout/inspector/inDOMUtils.cpp +++ b/layout/inspector/inDOMUtils.cpp @@ -114,8 +114,8 @@ inDOMUtils::GetAllStyleSheets(nsIDOMDocument *aDocument, uint32_t *aLength, } // Get the document sheets. - for (int32_t i = 0; i < document->GetNumberOfStyleSheets(); i++) { - sheets.AppendElement(document->GetStyleSheetAt(i)); + for (size_t i = 0; i < document->SheetCount(); i++) { + sheets.AppendElement(document->SheetAt(i)); } nsISupports** ret = static_cast(moz_xmalloc(sheets.Length() * diff --git a/layout/style/Loader.cpp b/layout/style/Loader.cpp index d4edfe81d..9894ce8f4 100644 --- a/layout/style/Loader.cpp +++ b/layout/style/Loader.cpp @@ -1334,7 +1334,7 @@ Loader::InsertSheetInDoc(StyleSheet* aSheet, // XXX Need to cancel pending sheet loads for this element, if any - int32_t sheetCount = aDocument->GetNumberOfStyleSheets(); + int32_t sheetCount = aDocument->SheetCount(); /* * Start the walk at the _end_ of the list, since in the typical @@ -1346,7 +1346,7 @@ Loader::InsertSheetInDoc(StyleSheet* aSheet, */ int32_t insertionPoint; for (insertionPoint = sheetCount - 1; insertionPoint >= 0; --insertionPoint) { - StyleSheet* curSheet = aDocument->GetStyleSheetAt(insertionPoint); + StyleSheet* curSheet = aDocument->SheetAt(insertionPoint); NS_ASSERTION(curSheet, "There must be a sheet here!"); nsCOMPtr sheetOwner = curSheet->GetOwnerNode(); if (sheetOwner && !aLinkingContent) { diff --git a/layout/style/ServoStyleSet.cpp b/layout/style/ServoStyleSet.cpp index 519d17aa8..331e2322a 100644 --- a/layout/style/ServoStyleSet.cpp +++ b/layout/style/ServoStyleSet.cpp @@ -339,7 +339,7 @@ ServoStyleSet::AddDocStyleSheet(ServoStyleSheet* aSheet, mSheets[SheetType::Doc].RemoveElement(aSheet); size_t index = - aDocument->FindDocStyleSheetInsertionPoint(mSheets[SheetType::Doc], aSheet); + aDocument->FindDocStyleSheetInsertionPoint(mSheets[SheetType::Doc], *aSheet); mSheets[SheetType::Doc].InsertElementAt(index, aSheet); // Maintain a mirrored list of sheets on the servo side. diff --git a/layout/style/nsStyleSet.cpp b/layout/style/nsStyleSet.cpp index 414eee4d4..558b9fa7f 100644 --- a/layout/style/nsStyleSet.cpp +++ b/layout/style/nsStyleSet.cpp @@ -734,7 +734,7 @@ nsStyleSet::AddDocStyleSheet(CSSStyleSheet* aSheet, nsIDocument* aDocument) bool present = sheets.RemoveElement(aSheet); - size_t index = aDocument->FindDocStyleSheetInsertionPoint(sheets, aSheet); + size_t index = aDocument->FindDocStyleSheetInsertionPoint(sheets, *aSheet); sheets.InsertElementAt(index, aSheet); if (!present) { -- cgit v1.2.3