Bug 1304792: Minimal Loader and CSSParser cleanup. r?heycam
MozReview-Commit-ID: DYOh8BtK7NT
--- a/layout/style/Loader.cpp
+++ b/layout/style/Loader.cpp
@@ -1421,18 +1421,16 @@ Loader::InsertChildSheet(StyleSheet* aSh
// child sheets should always start out enabled, even if they got
// cloned off of top-level sheets which were disabled
aSheet->AsGecko()->SetEnabled(true);
aParentSheet->AppendStyleSheet(aSheet);
aParentRule->SetSheet(aSheet->AsGecko()); // This sets the ownerRule on the sheet
LOG((" Inserting into parent sheet"));
- // LOG((" Inserting into parent sheet at position %d", insertionPoint));
-
return NS_OK;
}
/**
* LoadSheet handles the actual load of a sheet. If the load is
* supposed to be synchronous it just opens a channel synchronously
* using the given uri, wraps the resulting stream in a converter
* stream and calls ParseSheet. Otherwise it tries to look for an
@@ -1986,17 +1984,17 @@ Loader::LoadInlineStyle(nsIContent* aEle
const nsAString& aTitle,
const nsAString& aMedia,
Element* aScopeElement,
nsICSSLoaderObserver* aObserver,
bool* aCompleted,
bool* aIsAlternate)
{
LOG(("css::Loader::LoadInlineStyle"));
- NS_ASSERTION(mParsingDatas.Length() == 0, "We're in the middle of a parse?");
+ MOZ_ASSERT(mParsingDatas.IsEmpty(), "We're in the middle of a parse?");
*aCompleted = true;
if (!mEnabled) {
LOG_WARN((" Not enabled"));
return NS_ERROR_NOT_AVAILABLE;
}
--- a/layout/style/nsCSSParser.cpp
+++ b/layout/style/nsCSSParser.cpp
@@ -3791,18 +3791,18 @@ void
CSSParserImpl::ProcessImport(const nsString& aURLSpec,
nsMediaList* aMedia,
RuleAppendFunc aAppendFunc,
void* aData,
uint32_t aLineNumber,
uint32_t aColumnNumber)
{
RefPtr<css::ImportRule> rule = new css::ImportRule(aMedia, aURLSpec,
- aLineNumber,
- aColumnNumber);
+ aLineNumber,
+ aColumnNumber);
(*aAppendFunc)(rule, aData);
// Diagnose bad URIs even if we don't have a child loader.
nsCOMPtr<nsIURI> url;
// Charset will be deduced from mBaseURI, which is more or less correct.
nsresult rv = NS_NewURI(getter_AddRefs(url), aURLSpec, nullptr, mBaseURI);
if (NS_FAILED(rv)) {