corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1362119 - part 2 - Fixing the code style in dom/script, r=ehsan

Browse Source
This commit is contained in:
Andrea Marchesini
2017-05-08 08:25:03 +02:00
parent 1e596856da
commit d4f5a2f5ea
12 changed files with 127 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
dom/script/ScriptLoader.cpp
View File

@@ -232,9 +232,9 @@ IsScriptEventHandler(nsIContent* aScriptElement)
nsresult
ScriptLoader::CheckContentPolicy(nsIDocument* aDocument,
nsISupports *aContext,
nsIURI *aURI,
const nsAString &aType,
nsISupports* aContext,
nsIURI* aURI,
const nsAString& aType,
bool aIsPreLoad)
{
nsContentPolicyType contentPolicyType = aIsPreLoad
@@ -275,7 +275,7 @@ ScriptLoader::ModuleScriptsEnabled()
}
bool
ScriptLoader::ModuleMapContainsModule(ModuleLoadRequest *aRequest) const
ScriptLoader::ModuleMapContainsModule(ModuleLoadRequest* aRequest) const
{
// Returns whether we have fetched, or are currently fetching, a module script
// for the request's URL.
@@ -284,7 +284,7 @@ ScriptLoader::ModuleMapContainsModule(ModuleLoadRequest *aRequest) const
}
bool
ScriptLoader::IsFetchingModule(ModuleLoadRequest *aRequest) const
ScriptLoader::IsFetchingModule(ModuleLoadRequest* aRequest) const
{
bool fetching = mFetchingModules.Contains(aRequest->mURI);
MOZ_ASSERT_IF(fetching, !mFetchedModules.Contains(aRequest->mURI));
@@ -292,7 +292,7 @@ ScriptLoader::IsFetchingModule(ModuleLoadRequest *aRequest) const
}
void
ScriptLoader::SetModuleFetchStarted(ModuleLoadRequest *aRequest)
ScriptLoader::SetModuleFetchStarted(ModuleLoadRequest* aRequest)
{
// Update the module map to indicate that a module is currently being fetched.
@@ -302,7 +302,7 @@ ScriptLoader::SetModuleFetchStarted(ModuleLoadRequest *aRequest)
}
void
ScriptLoader::SetModuleFetchFinishedAndResumeWaitingRequests(ModuleLoadRequest *aRequest,
ScriptLoader::SetModuleFetchFinishedAndResumeWaitingRequests(ModuleLoadRequest* aRequest,
nsresult aResult)
{
// Update module map with the result of fetching a single module script. The
@@ -328,7 +328,7 @@ ScriptLoader::SetModuleFetchFinishedAndResumeWaitingRequests(ModuleLoadRequest *
}
RefPtr<GenericPromise>
ScriptLoader::WaitForModuleFetch(ModuleLoadRequest *aRequest)
ScriptLoader::WaitForModuleFetch(ModuleLoadRequest* aRequest)
{
MOZ_ASSERT(ModuleMapContainsModule(aRequest));
@@ -553,7 +553,7 @@ RequestedModuleIsInAncestorList(ModuleLoadRequest* aRequest, nsIURI* aURL, bool*
}
static nsresult
ResolveRequestedModules(ModuleLoadRequest* aRequest, nsCOMArray<nsIURI> &aUrls)
ResolveRequestedModules(ModuleLoadRequest* aRequest, nsCOMArray<nsIURI>& aUrls)
{
ModuleScript* ms = aRequest->mModuleScript;
@@ -819,7 +819,7 @@ ScriptLoader::IsBytecodeCacheEnabled()
}
nsresult
ScriptLoader::RestartLoad(ScriptLoadRequest *aRequest)
ScriptLoader::RestartLoad(ScriptLoadRequest* aRequest)
{
MOZ_ASSERT(aRequest->IsBytecode());
aRequest->mScriptBytecode.clearAndFree();
@@ -839,7 +839,7 @@ ScriptLoader::RestartLoad(ScriptLoadRequest *aRequest)
}
nsresult
ScriptLoader::StartLoad(ScriptLoadRequest *aRequest)
ScriptLoader::StartLoad(ScriptLoadRequest* aRequest)
{
MOZ_ASSERT(aRequest->IsLoading());
NS_ENSURE_TRUE(mDocument, NS_ERROR_NULL_POINTER);
@@ -880,7 +880,7 @@ ScriptLoader::StartLoad(ScriptLoadRequest *aRequest)
nsCOMPtr<nsILoadGroup> loadGroup = mDocument->GetDocumentLoadGroup();
nsCOMPtr<nsPIDOMWindowOuter> window = mDocument->MasterDocument()->GetWindow();
NS_ENSURE_TRUE(window, NS_ERROR_NULL_POINTER);
nsIDocShell *docshell = window->GetDocShell();
nsIDocShell* docshell = window->GetDocShell();
nsCOMPtr<nsIInterfaceRequestor> prompter(do_QueryInterface(docshell));
nsSecurityFlags securityFlags;
@@ -943,7 +943,7 @@ ScriptLoader::StartLoad(ScriptLoadRequest *aRequest)
}
}
nsIScriptElement *script = aRequest->mElement;
nsIScriptElement* script = aRequest->mElement;
nsCOMPtr<nsIClassOfService> cos(do_QueryInterface(channel));
if (cos) {
@@ -1007,8 +1007,8 @@ ScriptLoader::StartLoad(ScriptLoadRequest *aRequest)
}
bool
ScriptLoader::PreloadURIComparator::Equals(const PreloadInfo &aPi,
nsIURI * const &aURI) const
ScriptLoader::PreloadURIComparator::Equals(const PreloadInfo& aPi,
nsIURI* const& aURI) const
{
bool same;
return NS_SUCCEEDED(aPi.mRequest->mURI->Equals(aURI, &same)) &&
@@ -1063,7 +1063,7 @@ ParseTypeAttribute(const nsAString& aType, JSVersion* aVersion)
}
static bool
CSPAllowsInlineScript(nsIScriptElement *aElement, nsIDocument *aDocument)
CSPAllowsInlineScript(nsIScriptElement* aElement, nsIDocument* aDocument)
{
nsCOMPtr<nsIContentSecurityPolicy> csp;
// Note: For imports NodePrincipal and the principal of the master are
@@ -1098,7 +1098,7 @@ ScriptLoadRequest*
ScriptLoader::CreateLoadRequest(ScriptKind aKind,
nsIScriptElement* aElement,
uint32_t aVersion, CORSMode aCORSMode,
const SRIMetadata &aIntegrity)
const SRIMetadata& aIntegrity)
{
if (aKind == ScriptKind::Classic) {
return new ScriptLoadRequest(aKind, aElement, aVersion, aCORSMode,
@@ -1110,7 +1110,7 @@ ScriptLoader::CreateLoadRequest(ScriptKind aKind,
}
bool
ScriptLoader::ProcessScriptElement(nsIScriptElement *aElement)
ScriptLoader::ProcessScriptElement(nsIScriptElement* aElement)
{
// We need a document to evaluate scripts.
NS_ENSURE_TRUE(mDocument, false);
@@ -1447,7 +1447,7 @@ class NotifyOffThreadScriptLoadCompletedRunnable : public Runnable
RefPtr<ScriptLoadRequest> mRequest;
RefPtr<ScriptLoader> mLoader;
RefPtr<DocGroup> mDocGroup;
void *mToken;
void* mToken;
public:
NotifyOffThreadScriptLoadCompletedRunnable(ScriptLoadRequest* aRequest,
@@ -1546,7 +1546,7 @@ NotifyOffThreadScriptLoadCompletedRunnable::Run()
}
static void
OffThreadScriptLoaderCallback(void *aToken, void *aCallbackData)
OffThreadScriptLoaderCallback(void* aToken, void* aCallbackData)
{
RefPtr<NotifyOffThreadScriptLoadCompletedRunnable> aRunnable =
dont_AddRef(static_cast<NotifyOffThreadScriptLoadCompletedRunnable*>(aCallbackData));
@@ -1715,7 +1715,7 @@ ScriptLoader::ProcessRequest(ScriptLoadRequest* aRequest)
nsAutoMicroTask mt;
}
nsPIDOMWindowInner *pwin = master->GetInnerWindow();
nsPIDOMWindowInner* pwin = master->GetInnerWindow();
bool runScript = !!pwin;
if (runScript) {
nsContentUtils::DispatchTrustedEvent(scriptElem->OwnerDoc(),
@@ -1801,7 +1801,7 @@ already_AddRefed<nsIScriptGlobalObject>
ScriptLoader::GetScriptGlobalObject()
{
nsCOMPtr<nsIDocument> master = mDocument->MasterDocument();
nsPIDOMWindowInner *pwin = master->GetInnerWindow();
nsPIDOMWindowInner* pwin = master->GetInnerWindow();
if (!pwin) {
return nullptr;
}
@@ -2844,9 +2844,9 @@ ScriptLoader::ParsingComplete(bool aTerminated)
}
void
ScriptLoader::PreloadURI(nsIURI *aURI, const nsAString &aCharset,
const nsAString &aType,
const nsAString &aCrossOrigin,
ScriptLoader::PreloadURI(nsIURI* aURI, const nsAString& aCharset,
const nsAString& aType,
const nsAString& aCrossOrigin,
const nsAString& aIntegrity,
bool aScriptFromHead,
const mozilla::net::ReferrerPolicy aReferrerPolicy)
@@ -2887,7 +2887,7 @@ ScriptLoader::PreloadURI(nsIURI *aURI, const nsAString &aCharset,
return;
}
PreloadInfo *pi = mPreloads.AppendElement();
PreloadInfo* pi = mPreloads.AppendElement();
pi->mRequest = request;
pi->mCharset = aCharset;
}