diff options
| -rw-r--r-- | dom/script/ScriptLoader.cpp | 14 | ||||
| -rw-r--r-- | dom/script/ScriptLoader.h | 8 |
2 files changed, 11 insertions, 11 deletions
diff --git a/dom/script/ScriptLoader.cpp b/dom/script/ScriptLoader.cpp index afda82da03..69777c2477 100644 --- a/dom/script/ScriptLoader.cpp +++ b/dom/script/ScriptLoader.cpp @@ -1358,7 +1358,7 @@ ScriptLoader::ProcessScriptElement(nsIScriptElement *aElement) request->mJSVersion = version; if (aElement->GetScriptAsync()) { - request->mIsAsync = true; + request->mInAsyncList = true; if (request->IsReadyToRun()) { mLoadedAsyncRequests.AppendElement(request); // The script is available already. Run it ASAP when the event @@ -1469,7 +1469,7 @@ ScriptLoader::ProcessScriptElement(nsIScriptElement *aElement) modReq->mBaseURL = mDocument->GetDocBaseURI(); if (aElement->GetScriptAsync()) { - modReq->mIsAsync = true; + modReq->mInAsyncList = true; mLoadingAsyncRequests.AppendElement(modReq); } else { AddDeferRequest(modReq); @@ -2342,14 +2342,14 @@ ScriptLoader::HandleLoadError(ScriptLoadRequest *aRequest, nsresult aResult) { SetModuleFetchFinishedAndResumeWaitingRequests(request, aResult); } - if (aRequest->mIsDefer) { + if (aRequest->mInDeferList) { MOZ_ASSERT_IF(aRequest->IsModuleRequest(), aRequest->AsModuleRequest()->IsTopLevel()); if (aRequest->isInList()) { RefPtr<ScriptLoadRequest> req = mDeferRequests.Steal(aRequest); FireScriptAvailable(aResult, req); } - } else if (aRequest->mIsAsync) { + } else if (aRequest->mInAsyncList) { MOZ_ASSERT_IF(aRequest->IsModuleRequest(), aRequest->AsModuleRequest()->IsTopLevel()); if (aRequest->isInList()) { @@ -2423,10 +2423,10 @@ ScriptLoader::MaybeMoveToLoadedList(ScriptLoadRequest* aRequest) { MOZ_ASSERT(aRequest->IsReadyToRun()); - // If it's async, move it to the loaded list. aRequest->mIsAsync really + // If it's async, move it to the loaded list. aRequest->mInAsyncList really // _should_ be in a list, but the consequences if it's not are bad enough we // want to avoid trying to move it if it's not. - if (aRequest->mIsAsync) { + if (aRequest->mInAsyncList) { MOZ_ASSERT(aRequest->isInList()); if (aRequest->isInList()) { RefPtr<ScriptLoadRequest> req = mLoadingAsyncRequests.Steal(aRequest); @@ -2636,7 +2636,7 @@ ScriptLoader::PreloadURI(nsIURI *aURI, const nsAString &aCharset, void ScriptLoader::AddDeferRequest(ScriptLoadRequest* aRequest) { - aRequest->mIsDefer = true; + aRequest->mInDeferList = true; mDeferRequests.AppendElement(aRequest); if (mDeferEnabled && aRequest == mDeferRequests.getFirst() && mDocument && !mBlockingDOMContentLoaded) { diff --git a/dom/script/ScriptLoader.h b/dom/script/ScriptLoader.h index 46ed4e1202..82a8512c06 100644 --- a/dom/script/ScriptLoader.h +++ b/dom/script/ScriptLoader.h @@ -74,8 +74,8 @@ public: mProgress(Progress::Loading), mIsInline(true), mHasSourceMapURL(false), - mIsDefer(false), - mIsAsync(false), + mInDeferList(false), + mInAsyncList(false), mIsNonAsyncScriptInserted(false), mIsXSLT(false), mIsCanceled(false), @@ -159,8 +159,8 @@ public: Progress mProgress; // Are we still waiting for a load to complete? bool mIsInline; // Is the script inline or loaded? bool mHasSourceMapURL; // Does the HTTP header have a source map url? - bool mIsDefer; // True if we live in mDeferRequests. - bool mIsAsync; // True if we live in mLoadingAsyncRequests or mLoadedAsyncRequests. + bool mInDeferList; // True if we live in mDeferRequests. + bool mInAsyncList; // True if we live in mLoadingAsyncRequests or mLoadedAsyncRequests. bool mIsNonAsyncScriptInserted; // True if we live in mNonAsyncExternalScriptInsertedRequests bool mIsXSLT; // True if we live in mXSLTRequests. bool mIsCanceled; // True if we have been explicitly canceled. |