Bug 1519636 - Reformat recent changes to the Google coding style r=Ehsan
authorSylvestre Ledru <sledru@mozilla.com>
Mon, 21 Jan 2019 14:49:22 +0000
changeset 454672 d536f45f5b166c4b9562caf0c41991cb5df831cc
parent 454671 46a48161f4282af4708ddd3b2eed6943da864add
child 454673 4977d02e11915a93c6c80a51f3e7bdc99d5e2f08
child 454685 cbbf07c28138f414b792059ddb07423848a413d6
push id35409
push userrmaries@mozilla.com
push dateMon, 21 Jan 2019 17:48:45 +0000
treeherdermozilla-central@4977d02e1191 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersEhsan
bugs1519636
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1519636 - Reformat recent changes to the Google coding style r=Ehsan # ignore-this-changeset Differential Revision: https://phabricator.services.mozilla.com/D17063
browser/app/winlauncher/ErrorHandler.cpp
docshell/build/nsDocShellModule.cpp
dom/script/LoadedScript.cpp
dom/script/ScriptLoader.cpp
gfx/layers/wr/WebRenderUserData.cpp
gfx/thebes/gfxPlatform.cpp
gfx/webrender_bindings/WebRenderAPI.cpp
js/public/CompileOptions.h
js/src/builtin/ModuleObject.cpp
js/src/gc/GC.cpp
js/src/gc/Statistics.cpp
js/src/gc/Statistics.h
js/src/jit/IonBuilder.cpp
js/src/jsapi.cpp
js/src/jsapi.h
js/src/vm/SavedStacks.cpp
layout/painting/nsDisplayList.cpp
layout/painting/nsDisplayList.h
toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
tools/profiler/public/GeckoProfiler.h
widget/android/GeckoEditableSupport.cpp
xpcom/threads/DataMutex.h
--- a/browser/app/winlauncher/ErrorHandler.cpp
+++ b/browser/app/winlauncher/ErrorHandler.cpp
@@ -2,18 +2,18 @@
 /* vim: set ts=8 sts=2 et sw=2 tw=80: */
 /* This Source Code Form is subject to the terms of the Mozilla Public
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
 
 #include "ErrorHandler.h"
 
 #if defined(MOZ_LAUNCHER_PROCESS)
-#include "mozilla/LauncherRegistryInfo.h"
-#include "mozilla/Unused.h"
+#  include "mozilla/LauncherRegistryInfo.h"
+#  include "mozilla/Unused.h"
 #endif  // defined(MOZ_LAUNCHER_PROCESS)
 
 namespace mozilla {
 
 void HandleLauncherError(const LauncherError& aError) {
   // This is a placeholder error handler. We'll add telemetry and a fallback
   // error log in future revisions.
 
--- a/docshell/build/nsDocShellModule.cpp
+++ b/docshell/build/nsDocShellModule.cpp
@@ -184,18 +184,19 @@ const mozilla::Module::ContractIDEntry k
   { NS_EXTERNALURLHANDLERSERVICE_CONTRACTID, &kNS_EXTERNALURLHANDLERSERVICE_CID },
 #endif
   { NS_SHENTRY_CONTRACTID, &kNS_SHENTRY_CID },
   { NS_OSPERMISSIONREQUEST_CONTRACTID, &kNS_OSPERMISSIONREQUEST_CID, mozilla::Module::MAIN_PROCESS_ONLY },
   { nullptr }
     // clang-format on
 };
 
-static const mozilla::Module kDocShellModule = {mozilla::Module::kVersion,
-                                                kDocShellCIDs,
-                                                kDocShellContracts,
-                                                nullptr,
-                                                nullptr,
-                                                Initialize,
-                                                Shutdown,
-                                                mozilla::Module::ALLOW_IN_SOCKET_PROCESS};
+static const mozilla::Module kDocShellModule = {
+    mozilla::Module::kVersion,
+    kDocShellCIDs,
+    kDocShellContracts,
+    nullptr,
+    nullptr,
+    Initialize,
+    Shutdown,
+    mozilla::Module::ALLOW_IN_SOCKET_PROCESS};
 
 NSMODULE_DEFN(docshell_provider) = &kDocShellModule;
--- a/dom/script/LoadedScript.cpp
+++ b/dom/script/LoadedScript.cpp
@@ -51,17 +51,18 @@ void LoadedScript::AssociateWithScript(J
   // Set a JSScript's private value to point to this object. The JS engine will
   // increment our reference count by calling HostAddRefTopLevelScript(). This
   // is decremented by HostReleaseTopLevelScript() below when the JSScript dies.
 
   MOZ_ASSERT(JS::GetScriptPrivate(aScript).isUndefined());
   JS::SetScriptPrivate(aScript, JS::PrivateValue(this));
 }
 
-inline void CheckModuleScriptPrivate(LoadedScript* script, const JS::Value& aPrivate) {
+inline void CheckModuleScriptPrivate(LoadedScript* script,
+                                     const JS::Value& aPrivate) {
 #ifdef DEBUG
   if (script->IsModuleScript()) {
     JSObject* module = script->AsModuleScript()->mModuleRecord.unbarrieredGet();
     MOZ_ASSERT_IF(module, JS::GetModulePrivate(module) == aPrivate);
   }
 #endif
 }
 
--- a/dom/script/ScriptLoader.cpp
+++ b/dom/script/ScriptLoader.cpp
@@ -961,18 +961,17 @@ void ScriptLoader::EnsureModuleHooksInit
   jsapi.Init();
   JSRuntime* rt = JS_GetRuntime(jsapi.cx());
   if (JS::GetModuleResolveHook(rt)) {
     return;
   }
 
   JS::SetModuleResolveHook(rt, HostResolveImportedModule);
   JS::SetModuleMetadataHook(rt, HostPopulateImportMeta);
-  JS::SetScriptPrivateReferenceHooks(rt,
-                                     HostAddRefTopLevelScript,
+  JS::SetScriptPrivateReferenceHooks(rt, HostAddRefTopLevelScript,
                                      HostReleaseTopLevelScript);
 
   Preferences::RegisterCallbackAndCall(DynamicImportPrefChangedCallback,
                                        "javascript.options.dynamicImport",
                                        (void*)nullptr);
 }
 
 void ScriptLoader::CheckModuleDependenciesLoaded(ModuleLoadRequest* aRequest) {
--- a/gfx/layers/wr/WebRenderUserData.cpp
+++ b/gfx/layers/wr/WebRenderUserData.cpp
@@ -97,18 +97,18 @@ bool WebRenderImageData::UsingSharedSurf
   if (!mContainer || !mKey || mOwnsKey) {
     return false;
   }
 
   // If this is just an update with the same image key, then we know that the
   // share request initiated an asynchronous update so that we don't need to
   // rebuild the scene.
   wr::ImageKey key;
-  nsresult rv = SharedSurfacesChild::Share(mContainer, mManager,
-      mManager->AsyncResourceUpdates(), key);
+  nsresult rv = SharedSurfacesChild::Share(
+      mContainer, mManager, mManager->AsyncResourceUpdates(), key);
   return NS_SUCCEEDED(rv) && mKey.ref() == key;
 }
 
 void WebRenderImageData::ClearImageKey() {
   if (mKey) {
     // If we don't own the key, then the owner is responsible for discarding the
     // key when appropriate.
     if (mOwnsKey) {
--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -684,17 +684,17 @@ static void FinishAsyncMemoryReport() {
 
 // clang-format off
 // (For some reason, clang-format gets the second macro right, but totally mangles the first).
 #define REPORT_INTERNER(id)                      \
   helper.Report(aReport.interning.interners.id, \
                 "interning/" #id "/interners");
 // clang-format on
 
-#define REPORT_DATA_STORE(id)                      \
+#define REPORT_DATA_STORE(id)                     \
   helper.Report(aReport.interning.data_stores.id, \
                 "interning/" #id "/data-stores");
 
 NS_IMPL_ISUPPORTS(WebRenderMemoryReporter, nsIMemoryReporter)
 
 NS_IMETHODIMP
 WebRenderMemoryReporter::CollectReports(nsIHandleReportCallback* aHandleReport,
                                         nsISupports* aData, bool aAnonymize) {
--- a/gfx/webrender_bindings/WebRenderAPI.cpp
+++ b/gfx/webrender_bindings/WebRenderAPI.cpp
@@ -671,17 +671,18 @@ void DisplayListBuilder::Finalize(wr::La
   wr_api_finalize_builder(mWrState, &aOutContentSize, &aOutDisplayList.dl_desc,
                           &aOutDisplayList.dl.inner);
 }
 
 Maybe<wr::WrSpatialId> DisplayListBuilder::PushStackingContext(
     const wr::LayoutRect& aBounds, const wr::WrStackingContextClip& aClip,
     const WrAnimationProperty* aAnimation, const float* aOpacity,
     const gfx::Matrix4x4* aTransform, wr::TransformStyle aTransformStyle,
-    const wr::ReferenceFrameKind aReferenceFrameKind, const wr::MixBlendMode& aMixBlendMode,
+    const wr::ReferenceFrameKind aReferenceFrameKind,
+    const wr::MixBlendMode& aMixBlendMode,
     const nsTArray<wr::FilterOp>& aFilters, bool aIsBackfaceVisible,
     const wr::RasterSpace& aRasterSpace) {
   MOZ_ASSERT(mClipChainLeaf.isNothing(),
              "Non-empty leaf from clip chain given, but not used with SC!");
 
   wr::LayoutTransform matrix;
   if (aTransform) {
     matrix = ToLayoutTransform(*aTransform);
--- a/js/public/CompileOptions.h
+++ b/js/public/CompileOptions.h
@@ -246,19 +246,17 @@ class JS_PUBLIC_API OwningCompileOptions
 
   JSObject* element() const override { return elementRoot; }
   JSString* elementAttributeName() const override {
     return elementAttributeNameRoot;
   }
   JSScript* introductionScript() const override {
     return introductionScriptRoot;
   }
-  JSScript* scriptOrModule() const override {
-    return scriptOrModuleRoot;
-  }
+  JSScript* scriptOrModule() const override { return scriptOrModuleRoot; }
 
   /** Set this to a copy of |rhs|.  Return false on OOM. */
   bool copy(JSContext* cx, const ReadOnlyCompileOptions& rhs);
 
   /* These setters make copies of their string arguments and are fallible. */
   MOZ_MUST_USE bool setFile(JSContext* cx, const char* f);
   MOZ_MUST_USE bool setFileAndLine(JSContext* cx, const char* f, unsigned l);
   MOZ_MUST_USE bool setSourceMapURL(JSContext* cx, const char16_t* s);
@@ -424,19 +422,17 @@ class MOZ_STACK_CLASS JS_PUBLIC_API Comp
   JSString* elementAttributeName() const override {
     return elementAttributeNameRoot;
   }
 
   JSScript* introductionScript() const override {
     return introductionScriptRoot;
   }
 
-  JSScript* scriptOrModule() const override {
-    return scriptOrModuleRoot;
-  }
+  JSScript* scriptOrModule() const override { return scriptOrModuleRoot; }
 
   CompileOptions& setFile(const char* f) {
     filename_ = f;
     return *this;
   }
 
   CompileOptions& setLine(unsigned l) {
     lineno = l;
--- a/js/src/builtin/ModuleObject.cpp
+++ b/js/src/builtin/ModuleObject.cpp
@@ -1679,17 +1679,17 @@ JSObject* js::CallModuleResolveHook(JSCo
 }
 
 JSObject* js::StartDynamicModuleImport(JSContext* cx,
                                        HandleObject referencingScriptSource,
                                        HandleValue specifierArg) {
   RootedValue referencingPrivate(cx);
   if (referencingScriptSource) {
     ScriptSourceObject* sso =
-      &UncheckedUnwrap(referencingScriptSource)->as<ScriptSourceObject>();
+        &UncheckedUnwrap(referencingScriptSource)->as<ScriptSourceObject>();
     referencingPrivate = sso->canonicalPrivate();
   }
 
   RootedObject promiseConstructor(cx, JS::GetPromiseConstructor(cx));
   if (!promiseConstructor) {
     return nullptr;
   }
 
--- a/js/src/gc/GC.cpp
+++ b/js/src/gc/GC.cpp
@@ -8588,18 +8588,18 @@ JS::dbg::GarbageCollectionEvent::Ptr JS:
     JSContext* cx) const {
   return JS::dbg::GarbageCollectionEvent::Create(
       cx->runtime(), cx->runtime()->gc.stats(),
       cx->runtime()->gc.majorGCCount());
 }
 
 char16_t* JS::GCDescription::formatJSONTelemetry(JSContext* cx,
                                                  uint64_t timestamp) const {
-  UniqueChars cstr = cx->runtime()->gc.stats().renderJsonMessage(timestamp,
-      gcstats::Statistics::JSONUse::TELEMETRY);
+  UniqueChars cstr = cx->runtime()->gc.stats().renderJsonMessage(
+      timestamp, gcstats::Statistics::JSONUse::TELEMETRY);
 
   size_t nchars = strlen(cstr.get());
   UniqueTwoByteChars out(js_pod_malloc<char16_t>(nchars + 1));
   if (!out) {
     return nullptr;
   }
   out.get()[nchars] = 0;
 
@@ -8625,18 +8625,18 @@ TimeStamp JS::GCDescription::lastSliceEn
 
 JS::UniqueChars JS::GCDescription::sliceToJSONProfiler(JSContext* cx) const {
   size_t slices = cx->runtime()->gc.stats().slices().length();
   MOZ_ASSERT(slices > 0);
   return cx->runtime()->gc.stats().renderJsonSlice(slices - 1);
 }
 
 JS::UniqueChars JS::GCDescription::formatJSONProfiler(JSContext* cx) const {
-  return cx->runtime()->gc.stats().renderJsonMessage(0,
-      js::gcstats::Statistics::JSONUse::PROFILER);
+  return cx->runtime()->gc.stats().renderJsonMessage(
+      0, js::gcstats::Statistics::JSONUse::PROFILER);
 }
 
 JS_PUBLIC_API JS::UniqueChars JS::MinorGcToJSON(JSContext* cx) {
   JSRuntime* rt = cx->runtime();
   return rt->gc.stats().renderNurseryJson(rt);
 }
 
 JS_PUBLIC_API JS::GCSliceCallback JS::SetGCSliceCallback(
--- a/js/src/gc/Statistics.cpp
+++ b/js/src/gc/Statistics.cpp
@@ -580,17 +580,18 @@ void Statistics::writeLogMessage(const c
     vfprintf(gcDebugFile, fmt, args);
     fprintf(gcDebugFile, "\n");
     fflush(gcDebugFile);
   }
   va_end(args);
 }
 #endif
 
-UniqueChars Statistics::renderJsonMessage(uint64_t timestamp, Statistics::JSONUse use) const {
+UniqueChars Statistics::renderJsonMessage(uint64_t timestamp,
+                                          Statistics::JSONUse use) const {
   /*
    * The format of the JSON message is specified by the GCMajorMarkerPayload
    * type in perf.html
    * https://github.com/devtools-html/perf.html/blob/master/src/types/markers.js#L62
    *
    * All the properties listed here are created within the timings property
    * of the GCMajor marker.
    */
@@ -600,17 +601,17 @@ UniqueChars Statistics::renderJsonMessag
 
   Sprinter printer(nullptr, false);
   if (!printer.init()) {
     return UniqueChars(nullptr);
   }
   JSONPrinter json(printer);
 
   json.beginObject();
-  json.property("status", "completed");    // JSON Key #1
+  json.property("status", "completed");         // JSON Key #1
   formatJsonDescription(timestamp, json, use);  // #2-22
 
   if (use == Statistics::JSONUse::TELEMETRY) {
     json.beginListProperty("slices_list");  // #23
     for (unsigned i = 0; i < slices_.length(); i++) {
       formatJsonSlice(i, json);
     }
     json.endList();
@@ -620,18 +621,17 @@ UniqueChars Statistics::renderJsonMessag
   formatJsonPhaseTimes(phaseTimes, json);
   json.endObject();
 
   json.endObject();
 
   return printer.release();
 }
 
-void Statistics::formatJsonDescription(uint64_t timestamp,
-                                       JSONPrinter& json,
+void Statistics::formatJsonDescription(uint64_t timestamp, JSONPrinter& json,
                                        JSONUse use) const {
   // If you change JSON properties here, please update:
   // Telemetry ping code:
   //   toolkit/components/telemetry/other/GCTelemetry.jsm
   // Telemetry documentation:
   //   toolkit/components/telemetry/docs/data/main-ping.rst
   // Telemetry tests:
   //   toolkit/components/telemetry/tests/browser/browser_TelemetryGC.js,
--- a/js/src/gc/Statistics.h
+++ b/js/src/gc/Statistics.h
@@ -281,20 +281,17 @@ struct Statistics {
   void maybePrintProfileHeaders();
 
   // Print header line for profile times.
   void printProfileHeader();
 
   // Print total profile times on shutdown.
   void printTotalProfileTimes();
 
-  enum JSONUse {
-    TELEMETRY,
-    PROFILER
-  };
+  enum JSONUse { TELEMETRY, PROFILER };
 
   // Return JSON for a whole major GC.  If use == PROFILER then
   // detailed per-slice data and some other fields will be included.
   UniqueChars renderJsonMessage(uint64_t timestamp, JSONUse use) const;
 
   // Return JSON for the timings of just the given slice.
   UniqueChars renderJsonSlice(size_t sliceNum) const;
 
--- a/js/src/jit/IonBuilder.cpp
+++ b/js/src/jit/IonBuilder.cpp
@@ -13674,17 +13674,18 @@ AbortReasonOr<Ok> IonBuilder::jsop_impor
   return resumeAfter(meta);
 }
 
 AbortReasonOr<Ok> IonBuilder::jsop_dynamic_import() {
   JSObject* referencingScriptSource = script()->sourceObject();
 
   MDefinition* specifier = current->pop();
 
-  MDynamicImport* ins = MDynamicImport::New(alloc(), referencingScriptSource, specifier);
+  MDynamicImport* ins =
+      MDynamicImport::New(alloc(), referencingScriptSource, specifier);
   current->add(ins);
   current->push(ins);
   return resumeAfter(ins);
 }
 
 MInstruction* IonBuilder::addConvertElementsToDoubles(MDefinition* elements) {
   MInstruction* convert = MConvertElementsToDoubles::New(alloc(), elements);
   current->add(convert);
--- a/js/src/jsapi.cpp
+++ b/js/src/jsapi.cpp
@@ -3750,19 +3750,18 @@ JS_PUBLIC_API JS::Value JS::GetScriptedC
   if (iter.done() || !iter.hasScript()) {
     return UndefinedValue();
   }
 
   return iter.script()->sourceObject()->canonicalPrivate();
 }
 
 JS_PUBLIC_API void JS::SetScriptPrivateReferenceHooks(
-  JSRuntime* rt,
-  JS::ScriptPrivateReferenceHook addRefHook,
-  JS::ScriptPrivateReferenceHook releaseHook) {
+    JSRuntime* rt, JS::ScriptPrivateReferenceHook addRefHook,
+    JS::ScriptPrivateReferenceHook releaseHook) {
   AssertHeapIsIdle();
   rt->scriptPrivateAddRefHook = addRefHook;
   rt->scriptPrivateReleaseHook = releaseHook;
 }
 
 JS_PUBLIC_API bool JS::ModuleInstantiate(JSContext* cx,
                                          JS::HandleObject moduleArg) {
   AssertHeapIsIdle();
--- a/js/src/jsapi.h
+++ b/js/src/jsapi.h
@@ -2580,19 +2580,18 @@ extern JS_PUBLIC_API JS::Value GetScript
  * script private.
  */
 using ScriptPrivateReferenceHook = void (*)(const JS::Value&);
 
 /**
  * Set the script private finalize hook for the runtime to the given function.
  */
 extern JS_PUBLIC_API void SetScriptPrivateReferenceHooks(
-  JSRuntime* rt,
-  ScriptPrivateReferenceHook addRefHook,
-  ScriptPrivateReferenceHook releaseHook);
+    JSRuntime* rt, ScriptPrivateReferenceHook addRefHook,
+    ScriptPrivateReferenceHook releaseHook);
 
 /*
  * Perform the ModuleInstantiate operation on the given source text module
  * record.
  *
  * This transitively resolves all module dependencies (calling the
  * HostResolveImportedModule hook) and initializes the environment record for
  * the module.
--- a/js/src/vm/SavedStacks.cpp
+++ b/js/src/vm/SavedStacks.cpp
@@ -1320,19 +1320,20 @@ bool SavedStacks::insertFrames(JSContext
       // cache miss, if the frame's pc doesn't match the cache entry's, or if
       // the cache was emptied due to a realm mismatch.
       if (parent) {
         break;
       }
 
       // This frame doesn't have a cache entry, despite its hasCachedSavedFrame
       // flag being set. If this was due to a pc mismatch, we can clear the flag
-      // here and set things right. If the cache was emptied due to a realm mismatch,
-      // we should clear all the frames' flags as we walk to the bottom of the stack,
-      // so that they are all clear before we start pushing any new entries.
+      // here and set things right. If the cache was emptied due to a realm
+      // mismatch, we should clear all the frames' flags as we walk to the
+      // bottom of the stack, so that they are all clear before we start pushing
+      // any new entries.
       framePtr->clearHasCachedSavedFrame();
     }
 
     // We'll be pushing this frame onto stackChain. Gather the information
     // needed to construct the SavedFrame::Lookup.
     Rooted<LocationValue> location(cx);
     {
       AutoRealmUnchecked ar(cx, iter.realm());
--- a/layout/painting/nsDisplayList.cpp
+++ b/layout/painting/nsDisplayList.cpp
@@ -7889,19 +7889,19 @@ bool nsDisplayTransform::CreateWebRender
   bool animated =
       ActiveLayerTracker::IsStyleMaybeAnimated(Frame(), eCSSProperty_transform);
 
   bool preserve3D = mFrame->Extend3DContext() && !mIsTransformSeparator;
 
   StackingContextHelper sc(
       aSc, GetActiveScrolledRoot(), mFrame, this, aBuilder, filters,
       LayoutDeviceRect(position, LayoutDeviceSize()), &newTransformMatrix,
-      animationsId ? &prop : nullptr, nullptr, transformForSC, 
-      wr::ReferenceFrameKind::Transform, gfx::CompositionOp::OP_OVER, 
-      !BackfaceIsHidden(), preserve3D, deferredTransformItem, 
+      animationsId ? &prop : nullptr, nullptr, transformForSC,
+      wr::ReferenceFrameKind::Transform, gfx::CompositionOp::OP_OVER,
+      !BackfaceIsHidden(), preserve3D, deferredTransformItem,
       wr::WrStackingContextClip::None(), animated);
 
   return mStoredList.CreateWebRenderCommands(aBuilder, aResources, sc, aManager,
                                              aDisplayListBuilder);
 }
 
 bool nsDisplayTransform::UpdateScrollData(
     mozilla::layers::WebRenderScrollData* aData,
--- a/layout/painting/nsDisplayList.h
+++ b/layout/painting/nsDisplayList.h
@@ -672,17 +672,19 @@ class nsDisplayListBuilder {
   /**
    * Call this if we're doing normal painting to the window.
    */
   void SetPaintingToWindow(bool aToWindow) { mIsPaintingToWindow = aToWindow; }
   bool IsPaintingToWindow() const { return mIsPaintingToWindow; }
   /**
    * Call this if we're doing painting for WebRender
    */
-  void SetPaintingForWebRender(bool aForWebRender) { mIsPaintingForWebRender = true; }
+  void SetPaintingForWebRender(bool aForWebRender) {
+    mIsPaintingForWebRender = true;
+  }
   bool IsPaintingForWebRender() const { return mIsPaintingForWebRender; }
   /**
    * Call this to prevent descending into subdocuments.
    */
   void SetDescendIntoSubdocuments(bool aDescend) {
     mDescendIntoSubdocuments = aDescend;
   }
 
--- a/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
+++ b/toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
@@ -2071,19 +2071,21 @@ nsUrlClassifierDBService::Lookup(nsIPrin
                                  const nsACString& tables,
                                  nsIUrlClassifierCallback* c) {
   NS_ENSURE_TRUE(gDbBackgroundThread, NS_ERROR_NOT_INITIALIZED);
 
   bool dummy;
   return LookupURI(aPrincipal, tables, c, true, &dummy);
 }
 
-nsresult nsUrlClassifierDBService::LookupURI(
-    nsIPrincipal* aPrincipal, const nsACString& tables,
-    nsIUrlClassifierCallback* c, bool forceLookup, bool* didLookup) {
+nsresult nsUrlClassifierDBService::LookupURI(nsIPrincipal* aPrincipal,
+                                             const nsACString& tables,
+                                             nsIUrlClassifierCallback* c,
+                                             bool forceLookup,
+                                             bool* didLookup) {
   NS_ENSURE_TRUE(gDbBackgroundThread, NS_ERROR_NOT_INITIALIZED);
   NS_ENSURE_ARG(aPrincipal);
 
   if (nsContentUtils::IsSystemPrincipal(aPrincipal)) {
     *didLookup = false;
     return NS_OK;
   }
 
--- a/tools/profiler/public/GeckoProfiler.h
+++ b/tools/profiler/public/GeckoProfiler.h
@@ -44,27 +44,27 @@
 #  define AUTO_PROFILER_LABEL(label, category)
 #  define AUTO_PROFILER_LABEL_DYNAMIC_CSTR(label, category, cStr)
 #  define AUTO_PROFILER_LABEL_DYNAMIC_NSCSTRING(label, category, nsCStr)
 #  define AUTO_PROFILER_LABEL_DYNAMIC_LOSSY_NSSTRING(label, category, nsStr)
 #  define AUTO_PROFILER_LABEL_FAST(label, category, ctx)
 #  define AUTO_PROFILER_LABEL_DYNAMIC_FAST(label, dynamicString, category, \
                                            ctx, flags)
 
-#define PROFILER_ADD_MARKER(markerName, category)
-#define PROFILER_ADD_NETWORK_MARKER(uri, pri, channel, type, start, end, \
-                                    count, cache, timings, redirect)
+#  define PROFILER_ADD_MARKER(markerName, category)
+#  define PROFILER_ADD_NETWORK_MARKER(uri, pri, channel, type, start, end, \
+                                      count, cache, timings, redirect)
 
-#define DECLARE_DOCSHELL_AND_HISTORY_ID(docShell)
-#define PROFILER_TRACING(categoryString, markerName, category, kind)
-#define PROFILER_TRACING_DOCSHELL(categoryString, markerName, category, kind, \
-                                  docshell)
-#define AUTO_PROFILER_TRACING(categoryString, markerName, category)
-#define AUTO_PROFILER_TRACING_DOCSHELL(categoryString, markerName, category, \
-                                       docShell)
+#  define DECLARE_DOCSHELL_AND_HISTORY_ID(docShell)
+#  define PROFILER_TRACING(categoryString, markerName, category, kind)
+#  define PROFILER_TRACING_DOCSHELL(categoryString, markerName, category, \
+                                    kind, docshell)
+#  define AUTO_PROFILER_TRACING(categoryString, markerName, category)
+#  define AUTO_PROFILER_TRACING_DOCSHELL(categoryString, markerName, category, \
+                                         docShell)
 
 #else  // !MOZ_GECKO_PROFILER
 
 #  include <functional>
 #  include <signal.h>
 #  include <stdarg.h>
 #  include <stdint.h>
 #  include <stdlib.h>
@@ -608,18 +608,18 @@ mozilla::Maybe<ProfilerBufferInfo> profi
 // Insert a marker in the profile timeline. This is useful to delimit something
 // important happening such as the first paint. Unlike labels, which are only
 // recorded in the profile buffer if a sample is collected while the label is
 // on the label stack, markers will always be recorded in the profile buffer.
 // aMarkerName is copied, so the caller does not need to ensure it lives for a
 // certain length of time. A no-op if the profiler is inactive or in privacy
 // mode.
 
-#define PROFILER_ADD_MARKER(markerName, category) \
-  profiler_add_marker(markerName, js::ProfilingStackFrame::Category::category)
+#  define PROFILER_ADD_MARKER(markerName, category) \
+    profiler_add_marker(markerName, js::ProfilingStackFrame::Category::category)
 
 void profiler_add_marker(const char* aMarkerName,
                          js::ProfilingStackFrame::Category aCategory);
 void profiler_add_marker(const char* aMarkerName,
                          js::ProfilingStackFrame::Category aCategory,
                          mozilla::UniquePtr<ProfilerMarkerPayload> aPayload);
 void profiler_add_js_marker(const char* aMarkerName);
 
@@ -665,49 +665,51 @@ enum TracingKind {
     } else {                                        \
       docShellId = Nothing();                       \
       docShellHistoryId = Nothing();                \
     }
 
 // Adds a tracing marker to the profile. A no-op if the profiler is inactive or
 // in privacy mode.
 
-#define PROFILER_TRACING(categoryString, markerName, category, kind) \
-  profiler_tracing(categoryString, markerName,                       \
-                   js::ProfilingStackFrame::Category::category, kind)
-#define PROFILER_TRACING_DOCSHELL(categoryString, markerName, category, kind, \
-                                  docShell)                                   \
-  DECLARE_DOCSHELL_AND_HISTORY_ID(docShell);                                  \
-  profiler_tracing(categoryString, markerName,                                \
-                   js::ProfilingStackFrame::Category::category, kind,         \
-                   docShellId, docShellHistoryId)
+#  define PROFILER_TRACING(categoryString, markerName, category, kind) \
+    profiler_tracing(categoryString, markerName,                       \
+                     js::ProfilingStackFrame::Category::category, kind)
+#  define PROFILER_TRACING_DOCSHELL(categoryString, markerName, category, \
+                                    kind, docShell)                       \
+    DECLARE_DOCSHELL_AND_HISTORY_ID(docShell);                            \
+    profiler_tracing(categoryString, markerName,                          \
+                     js::ProfilingStackFrame::Category::category, kind,   \
+                     docShellId, docShellHistoryId)
 
 void profiler_tracing(
     const char* aCategoryString, const char* aMarkerName,
     js::ProfilingStackFrame::Category aCategory, TracingKind aKind,
     const mozilla::Maybe<nsID>& aDocShellId = mozilla::Nothing(),
     const mozilla::Maybe<uint32_t>& aDocShellHistoryId = mozilla::Nothing());
 void profiler_tracing(
     const char* aCategoryString, const char* aMarkerName,
     js::ProfilingStackFrame::Category aCategory, TracingKind aKind,
     UniqueProfilerBacktrace aCause,
     const mozilla::Maybe<nsID>& aDocShellId = mozilla::Nothing(),
     const mozilla::Maybe<uint32_t>& aDocShellHistoryId = mozilla::Nothing());
 
 // Adds a START/END pair of tracing markers.
-#define AUTO_PROFILER_TRACING(categoryString, markerName, category)            \
-  mozilla::AutoProfilerTracing PROFILER_RAII(                                  \
-      categoryString, markerName, js::ProfilingStackFrame::Category::category, \
-      mozilla::Nothing(), mozilla::Nothing())
-#define AUTO_PROFILER_TRACING_DOCSHELL(categoryString, markerName, category,   \
-                                       docShell)                               \
-  DECLARE_DOCSHELL_AND_HISTORY_ID(docShell);                                   \
-  mozilla::AutoProfilerTracing PROFILER_RAII(                                  \
-      categoryString, markerName, js::ProfilingStackFrame::Category::category, \
-      docShellId, docShellHistoryId)
+#  define AUTO_PROFILER_TRACING(categoryString, markerName, category)    \
+    mozilla::AutoProfilerTracing PROFILER_RAII(                          \
+        categoryString, markerName,                                      \
+        js::ProfilingStackFrame::Category::category, mozilla::Nothing(), \
+        mozilla::Nothing())
+#  define AUTO_PROFILER_TRACING_DOCSHELL(categoryString, markerName, category, \
+                                         docShell)                             \
+    DECLARE_DOCSHELL_AND_HISTORY_ID(docShell);                                 \
+    mozilla::AutoProfilerTracing PROFILER_RAII(                                \
+        categoryString, markerName,                                            \
+        js::ProfilingStackFrame::Category::category, docShellId,               \
+        docShellHistoryId)
 
 //---------------------------------------------------------------------------
 // Output profiles
 //---------------------------------------------------------------------------
 
 // Get the profile encoded as a JSON string. A no-op (returning nullptr) if the
 // profiler is inactive.
 // If aIsShuttingDown is true, the current time is included as the process
--- a/widget/android/GeckoEditableSupport.cpp
+++ b/widget/android/GeckoEditableSupport.cpp
@@ -1444,31 +1444,29 @@ nsresult GeckoEditableSupport::NotifyIME
       //
       if (mIsRemote) {
         OnNotifyIMEOfCompositionEventHandled();
       } else {
         // Also, when receiving this event, mIMEDelaySynchronizeReply won't
         // update yet on non-e10s case since IME event is posted before updating
         // it. So we have to delay handling of this event.
         RefPtr<GeckoEditableSupport> self(this);
-        nsAppShell::PostEvent([this, self] {
-          OnNotifyIMEOfCompositionEventHandled();
-        });
+        nsAppShell::PostEvent(
+            [this, self] { OnNotifyIMEOfCompositionEventHandled(); });
       }
       break;
     }
 
     default:
       break;
   }
   return NS_OK;
 }
 
-void GeckoEditableSupport::OnNotifyIMEOfCompositionEventHandled()
-{
+void GeckoEditableSupport::OnNotifyIMEOfCompositionEventHandled() {
   // NOTIFY_IME_OF_COMPOSITION_EVENT_HANDLED may be merged with multiple events,
   // so reset count.
   mIMEActiveCompositionCount = 0;
   if (mIMEDelaySynchronizeReply) {
     FlushIMEChanges();
   }
 
   // Hardware keyboard support requires each string rect.
--- a/xpcom/threads/DataMutex.h
+++ b/xpcom/threads/DataMutex.h
@@ -80,17 +80,18 @@ class DataMutex {
     }
 
     DataMutex<T>* mOwner;
   };
 
  public:
   explicit DataMutex(const char* aName) : mMutex(aName) {}
 
-  DataMutex(T&& aValue, const char* aName) : mMutex(aName), mValue(std::move(aValue)) {}
+  DataMutex(T&& aValue, const char* aName)
+      : mMutex(aName), mValue(std::move(aValue)) {}
 
   AutoLock Lock() { return AutoLock(this); }
 
  private:
   Mutex mMutex;
   T mValue;
 };