Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 541496 prelim 2: nuke trailing whitespace in layout/style/Loader.{h,cpp}. rs=dbaron

Browse Source
This commit is contained in:
Zack Weinberg 2011-05-06 08:45:36 -07:00
parent 3febb9d39a
commit 2e40645748
2 changed files with 63 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

126
layout/style/Loader.cpp
View File

@ -222,7 +222,7 @@ public:
// mIsCancelled is set to true when a sheet load is stopped by
// Stop() or StopLoadingSheet() (which was removed in Bug 556446).
// SheetLoadData::OnStreamComplete() checks this to avoid parsing
// SheetLoadData::OnStreamComplete() checks this to avoid parsing
// sheets that have been cancelled and such.
PRPackedBool mIsCancelled : 1;
@ -498,7 +498,7 @@ CollectNonAlternates(URIAndPrincipalHashKey *aKey,
{
NS_PRECONDITION(aData, "Must have a data");
NS_PRECONDITION(aClosure, "Must have an array");
// Note that we don't want to affect what the selected style set is,
// so use PR_TRUE for aHasAlternateRel.
if (aData->mLoader->IsAlternate(aData->mTitle, PR_TRUE)) {
@ -521,10 +521,10 @@ Loader::SetPreferredSheet(const nsAString& aTitle)
doc->GetPreferredStyleSheetSet(currentPreferred);
}
NS_ASSERTION(currentPreferred.Equals(aTitle),
"Unexpected argument to SetPreferredSheet");
"Unexpected argument to SetPreferredSheet");
}
#endif
mPreferredSheet = aTitle;
// start any pending alternates that aren't alternates anymore
@ -613,7 +613,7 @@ static nsresult GetCharsetFromData(const unsigned char* aStyleSheetData,
if (aStyleSheetData[pos] == '"') {
break;
}
// casting to avoid ambiguities
charset.Append(char(aStyleSheetData[pos]));
pos += step;
@ -709,14 +709,14 @@ SheetLoadData::OnDetermineCharset(nsIUnicharStreamLoader* aLoader,
}
#endif
}
if (aCharset.IsEmpty() && mLoader->mDocument) {
// no useful data on charset. Try the document charset.
aCharset = mLoader->mDocument->GetDocumentCharacterSet();
#ifdef PR_LOGGING
LOG((" Set from document: %s", PromiseFlatCString(aCharset).get()));
#endif
}
}
if (aCharset.IsEmpty()) {
NS_WARNING("Unable to determine charset for sheet, using ISO-8859-1!");
@ -761,14 +761,14 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
// this data and a likely crash.
return NS_OK;
}
if (!mLoader->mDocument && !mIsNonDocumentSheet) {
// Sorry, we don't care about this load anymore
LOG_WARN((" No document and not non-document sheet; dropping load"));
mLoader->SheetComplete(this, NS_BINDING_ABORTED);
return NS_OK;
}
if (NS_FAILED(aStatus)) {
LOG_WARN((" Load failed: status 0x%x", aStatus));
mLoader->SheetComplete(this, aStatus);
@ -782,7 +782,7 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
mLoader->SheetComplete(this, result);
return NS_OK;
}
nsCOMPtr<nsIURI> originalURI;
channel->GetOriginalURI(getter_AddRefs(originalURI));
@ -813,14 +813,14 @@ SheetLoadData::OnStreamComplete(nsIUnicharStreamLoader* aLoader,
mLoader->SheetComplete(this, result);
return NS_OK;
}
mSheet->SetPrincipal(principal);
#ifdef MOZ_TIMELINE
NS_TIMELINE_OUTDENT();
NS_TIMELINE_MARK_CHANNEL("SheetLoadData::OnStreamComplete(%s)", channel);
#endif // MOZ_TIMELINE
// If it's an HTTP channel, we want to make sure this is not an
// error document we got.
nsCOMPtr<nsIHttpChannel> httpChannel(do_QueryInterface(channel));
@ -926,7 +926,7 @@ Loader::IsAlternate(const nsAString& aTitle, PRBool aHasAlternateRel)
if (aTitle.IsEmpty()) {
return PR_FALSE;
}
if (!aHasAlternateRel && mDocument && mPreferredSheet.IsEmpty()) {
// There's no preferred set yet, and we now have a sheet with a title.
// Make that be the preferred set.
@ -940,7 +940,7 @@ Loader::IsAlternate(const nsAString& aTitle, PRBool aHasAlternateRel)
/**
* CheckLoadAllowed will return success if the load is allowed,
* failure otherwise.
* failure otherwise.
*
* @param aSourcePrincipal the principal of the node or document or parent
* sheet loading the sheet
@ -956,7 +956,7 @@ Loader::CheckLoadAllowed(nsIPrincipal* aSourcePrincipal,
LOG(("css::Loader::CheckLoadAllowed"));
nsresult rv;
if (aSourcePrincipal) {
// Check with the security manager
nsIScriptSecurityManager *secMan = nsContentUtils::GetSecurityManager();
@ -1015,11 +1015,11 @@ Loader::CreateSheet(nsIURI* aURI,
(mLoadingDatas.IsInitialized() || mLoadingDatas.Init()) &&
(mPendingDatas.IsInitialized() || mPendingDatas.Init()),
NS_ERROR_OUT_OF_MEMORY);
nsresult rv = NS_OK;
*aSheet = nsnull;
aSheetState = eSheetStateUnknown;
if (aURI) {
aSheetState = eSheetComplete;
nsRefPtr<nsCSSStyleSheet> sheet;
@ -1040,11 +1040,11 @@ Loader::CreateSheet(nsIURI* aURI,
if (!sheet) {
// Then our per-document complete sheets.
URIAndPrincipalHashKey key(aURI, aLoaderPrincipal);
mCompleteSheets.Get(&key, getter_AddRefs(sheet));
LOG((" From completed: %p", sheet.get()));
}
if (sheet) {
// This sheet came from the XUL cache or our per-document hashtable; it
// better be a complete sheet.
@ -1139,7 +1139,7 @@ Loader::CreateSheet(nsIURI* aURI,
NS_ASSERTION(*aSheet, "We should have a sheet by now!");
NS_ASSERTION(aSheetState != eSheetStateUnknown, "Have to set a state!");
LOG((" State: %s", gStateStrings[aSheetState]));
return NS_OK;
}
@ -1184,7 +1184,7 @@ Loader::PrepareSheet(nsCSSStyleSheet* aSheet,
if (aIsAlternate) {
*aIsAlternate = alternate;
}
return NS_OK;
return NS_OK;
}
/**
@ -1231,7 +1231,7 @@ Loader::InsertSheetInDoc(nsCSSStyleSheet* aSheet,
domSheet->GetOwnerNode(getter_AddRefs(sheetOwner));
if (sheetOwner && !aLinkingContent) {
// Keep moving; all sheets with a sheetOwner come after all
// sheets without a linkingNode
// sheets without a linkingNode
continue;
}
@ -1254,7 +1254,7 @@ Loader::InsertSheetInDoc(nsCSSStyleSheet* aSheet,
}
++insertionPoint; // adjust the index to the spot we want to insert in
// XXX <meta> elements do not implement nsIStyleSheetLinkingElement;
// need to fix this for them to be ordered correctly.
nsCOMPtr<nsIStyleSheetLinkingElement>
@ -1293,7 +1293,7 @@ Loader::InsertChildSheet(nsCSSStyleSheet* aSheet,
// child sheets should always start out enabled, even if they got
// cloned off of top-level sheets which were disabled
aSheet->SetEnabled(PR_TRUE);
aParentSheet->AppendStyleSheet(aSheet);
aParentRule->SetSheet(aSheet); // This sets the ownerRule on the sheet
@ -1331,8 +1331,8 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
#endif
LOG_URI(" Load from: '%s'", aLoadData->mURI);
nsresult rv = NS_OK;
nsresult rv = NS_OK;
if (!mDocument && !aLoadData->mIsNonDocumentSheet) {
// No point starting the load; just release all the data and such.
@ -1360,7 +1360,7 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
}
NS_ASSERTION(channel, "NS_OpenURI lied?");
// Get the principal for this sheet
nsCOMPtr<nsIPrincipal> principal;
if (aLoadData->mUseSystemPrincipal) {
@ -1379,9 +1379,9 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
aLoadData->mSheet->SetPrincipal(principal);
nsCOMPtr<nsIConverterInputStream> converterStream =
nsCOMPtr<nsIConverterInputStream> converterStream =
do_CreateInstance("@mozilla.org/intl/converter-input-stream;1", &rv);
if (NS_FAILED(rv)) {
LOG_ERROR((" Failed to create converter stream"));
SheetComplete(aLoadData, rv);
@ -1397,7 +1397,7 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
8192,
nsIConverterInputStream::
DEFAULT_REPLACEMENT_CHARACTER);
if (NS_FAILED(rv)) {
LOG_ERROR((" Failed to initialize converter stream"));
SheetComplete(aLoadData, rv);
@ -1421,7 +1421,7 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
mPendingDatas.Get(&key, &existingData);
NS_ASSERTION(existingData, "CreateSheet lied about the state");
}
if (existingData) {
LOG((" Glomming on to existing load"));
SheetLoadData* data = existingData;
@ -1473,13 +1473,13 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
NS_TIMELINE_MARK_URI("Loading style sheet: %s", aLoadData->mURI);
NS_TIMELINE_INDENT();
#endif
nsCOMPtr<nsIChannel> channel;
rv = NS_NewChannel(getter_AddRefs(channel),
aLoadData->mURI, nsnull, loadGroup, nsnull,
nsIChannel::LOAD_NORMAL | nsIChannel::LOAD_CLASSIFY_URI,
channelPolicy);
if (NS_FAILED(rv)) {
#ifdef DEBUG
mSyncCallback = PR_FALSE;
@ -1543,9 +1543,9 @@ Loader::LoadSheet(SheetLoadData* aLoadData, StyleSheetState aSheetState)
SheetComplete(aLoadData, NS_ERROR_OUT_OF_MEMORY);
return NS_ERROR_OUT_OF_MEMORY;
}
aLoadData->mIsLoading = PR_TRUE;
return NS_OK;
}
@ -1629,7 +1629,7 @@ Loader::SheetComplete(SheetLoadData* aLoadData, nsresult aStatus)
mDatasToNotifyOn += count;
for (PRUint32 i = 0; i < count; ++i) {
--mDatasToNotifyOn;
SheetLoadData* data = datasToNotify[i];
NS_ASSERTION(data && data->mMustNotify, "How did this data get here?");
if (data->mObserver) {
@ -1684,7 +1684,7 @@ Loader::DoSheetComplete(SheetLoadData* aLoadData, nsresult aStatus,
aLoadData->mIsLoading = PR_FALSE;
}
}
// Go through and deal with the whole linked list.
SheetLoadData* data = aLoadData;
while (data) {
@ -1714,7 +1714,7 @@ Loader::DoSheetComplete(SheetLoadData* aLoadData, nsresult aStatus,
!mParsingDatas.Contains(data->mParentData)) {
DoSheetComplete(data->mParentData, aStatus, aDatasToNotify);
}
data = data->mNext;
}
@ -1745,7 +1745,7 @@ Loader::DoSheetComplete(SheetLoadData* aLoadData, nsresult aStatus,
nsresult
Loader::LoadInlineStyle(nsIContent* aElement,
nsIUnicharInputStream* aStream,
nsIUnicharInputStream* aStream,
PRUint32 aLineNumber,
const nsAString& aTitle,
const nsAString& aMedia,
@ -1768,7 +1768,6 @@ Loader::LoadInlineStyle(nsIContent* aElement,
nsCOMPtr<nsIStyleSheetLinkingElement> owningElement(do_QueryInterface(aElement));
NS_ASSERTION(owningElement, "Element is not a style linking element!");
// Since we're not planning to load a URI, no need to hand a principal to the
// load data or to CreateSheet().
@ -1783,12 +1782,12 @@ Loader::LoadInlineStyle(nsIContent* aElement,
rv = PrepareSheet(sheet, aTitle, aMedia, nsnull, PR_FALSE,
aIsAlternate);
NS_ENSURE_SUCCESS(rv, rv);
LOG((" Sheet is alternate: %d", *aIsAlternate));
rv = InsertSheetInDoc(sheet, aElement, mDocument);
NS_ENSURE_SUCCESS(rv, rv);
SheetLoadData* data = new SheetLoadData(this, aTitle, nsnull, sheet,
owningElement, *aIsAlternate,
aObserver, nsnull);
@ -1812,11 +1811,11 @@ Loader::LoadInlineStyle(nsIContent* aElement,
data->mMustNotify = PR_TRUE;
}
return rv;
}
}
nsresult
Loader::LoadStyleLink(nsIContent* aElement,
nsIURI* aURL,
nsIURI* aURL,
const nsAString& aTitle,
const nsAString& aMedia,
PRBool aHasAlternateRel,
@ -1836,7 +1835,7 @@ Loader::LoadStyleLink(nsIContent* aElement,
LOG_WARN((" Not enabled"));
return NS_ERROR_NOT_AVAILABLE;
}
NS_ENSURE_TRUE(mDocument, NS_ERROR_NOT_INITIALIZED);
nsIPrincipal* principal =
@ -1850,7 +1849,7 @@ Loader::LoadStyleLink(nsIContent* aElement,
if (NS_FAILED(rv)) return rv;
LOG((" Passed load check"));
StyleSheetState state;
nsRefPtr<nsCSSStyleSheet> sheet;
rv = CreateSheet(aURL, aElement, principal, PR_FALSE, state,
@ -1862,7 +1861,7 @@ Loader::LoadStyleLink(nsIContent* aElement,
NS_ENSURE_SUCCESS(rv, rv);
LOG((" Sheet is alternate: %d", *aIsAlternate));
rv = InsertSheetInDoc(sheet, aElement, mDocument);
NS_ENSURE_SUCCESS(rv, rv);
@ -1913,7 +1912,7 @@ Loader::LoadStyleLink(nsIContent* aElement,
nsresult
Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
nsIURI* aURL,
nsIURI* aURL,
nsMediaList* aMedia,
ImportRule* aParentRule)
{
@ -1925,7 +1924,7 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
LOG_WARN((" Not enabled"));
return NS_ERROR_NOT_AVAILABLE;
}
LOG_URI(" Child uri: '%s'", aURL);
nsCOMPtr<nsIDOMNode> owningNode;
@ -1956,7 +1955,7 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
if (NS_FAILED(rv)) return rv;
LOG((" Passed load check"));
SheetLoadData* parentData = nsnull;
nsCOMPtr<nsICSSLoaderObserver> observer;
@ -1998,10 +1997,10 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
const nsSubstring& empty = EmptyString();
rv = PrepareSheet(sheet, empty, empty, aMedia);
NS_ENSURE_SUCCESS(rv, rv);
rv = InsertChildSheet(sheet, aParentSheet, aParentRule);
NS_ENSURE_SUCCESS(rv, rv);
if (state == eSheetComplete) {
LOG((" Sheet already complete"));
// We're completely done. No need to notify, even, since the
@ -2010,7 +2009,6 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
return NS_OK;
}
SheetLoadData* data = new SheetLoadData(this, aURL, sheet, parentData,
observer, principal);
@ -2030,7 +2028,7 @@ Loader::LoadChildSheet(nsCSSStyleSheet* aParentSheet,
if (!syncLoad) {
data->mMustNotify = PR_TRUE;
}
return rv;
return rv;
}
nsresult
@ -2071,7 +2069,7 @@ Loader::LoadSheet(nsIURI* aURL,
}
nsresult
Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
PRBool aAllowUnsafeRules,
PRBool aUseSystemPrincipal,
nsIPrincipal* aOriginPrincipal,
@ -2086,11 +2084,11 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
NS_ASSERTION(mParsingDatas.Length() == 0, "We're in the middle of a parse?");
LOG_URI(" Non-document sheet uri: '%s'", aURL);
if (aSheet) {
*aSheet = nsnull;
}
if (!mEnabled) {
LOG_WARN((" Not enabled"));
return NS_ERROR_NOT_AVAILABLE;
@ -2104,7 +2102,7 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
StyleSheetState state;
nsRefPtr<nsCSSStyleSheet> sheet;
PRBool syncLoad = (aObserver == nsnull);
rv = CreateSheet(aURL, nsnull, aOriginPrincipal, syncLoad, state,
getter_AddRefs(sheet));
NS_ENSURE_SUCCESS(rv, rv);
@ -2112,7 +2110,7 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
const nsSubstring& empty = EmptyString();
rv = PrepareSheet(sheet, empty, empty, nsnull);
NS_ENSURE_SUCCESS(rv, rv);
if (state == eSheetComplete) {
LOG((" Sheet already complete"));
if (aObserver) {
@ -2133,7 +2131,7 @@ Loader::InternalLoadNonDocumentSheet(nsIURI* aURL,
sheet->SetComplete();
return NS_ERROR_OUT_OF_MEMORY;
}
NS_ADDREF(data);
rv = LoadSheet(data, state);
NS_ENSURE_SUCCESS(rv, rv);
@ -2220,7 +2218,7 @@ StopLoadingSheetCallback(URIAndPrincipalHashKey* aKey,
aData->mIsLoading = PR_FALSE; // we will handle the removal right here
aData->mIsCancelled = PR_TRUE;
static_cast<Loader::LoadDataArray*>(aClosure)->AppendElement(aData);
return PL_DHASH_REMOVE;
@ -2234,7 +2232,7 @@ Loader::Stop()
PRUint32 loadingCount =
mLoadingDatas.IsInitialized() ? mLoadingDatas.Count() : 0;
LoadDataArray arr(pendingCount + loadingCount + mPostedEvents.Length());
if (pendingCount) {
mPendingDatas.Enumerate(StopLoadingSheetCallback, &arr);
}

2
layout/style/Loader.h
View File

@ -315,7 +315,7 @@ public:
/**
* nsresult Loader::StopLoadingSheet(nsIURI* aURL), which notifies the
* nsICSSLoaderObserver with NS_BINDING_ABORTED, was removed in Bug 556446.
* nsICSSLoaderObserver with NS_BINDING_ABORTED, was removed in Bug 556446.
* It can be found in revision 2c44a32052ad.
*/