Bug 1148527 - Indentation fix after bug 1145631, r=ehsan
authorAndrea Marchesini <amarchesini@mozilla.com>
Fri, 27 Mar 2015 18:52:19 +0000
changeset 253933 8bc7561d75577b08ae0c5449104378144a6fc9e0
parent 253932 1d0ffffbcc3b88ed370be268cabfc7b97a83cdef
child 253934 fef7f455e20c01e3fd9d8fef357da782a08442a3
push id1314
push userbokeefe@alum.wpi.edu
push dateMon, 30 Mar 2015 17:20:11 +0000
reviewersehsan
bugs1148527, 1145631
milestone39.0a1
Bug 1148527 - Indentation fix after bug 1145631, r=ehsan
accessible/base/NotificationController.h
accessible/base/nsAccessibilityService.h
accessible/windows/msaa/IUnknownImpl.h
accessible/windows/uia/uiaRawElmProvider.h
browser/components/feeds/nsFeedSniffer.h
caps/nsNullPrincipalURI.h
caps/nsScriptSecurityManager.h
chrome/nsChromeProtocolHandler.h
docshell/shistory/src/nsSHEntry.h
docshell/shistory/src/nsSHEntryShared.h
docshell/shistory/src/nsSHistory.h
dom/archivereader/ArchiveReader.h
dom/archivereader/ArchiveZipFile.cpp
dom/asmjscache/AsmJSCache.cpp
dom/base/Attr.h
dom/base/Comment.h
dom/base/Console.h
dom/base/DOMImplementation.h
dom/base/DOMParser.h
dom/base/DOMRect.h
dom/base/Element.h
dom/base/EventSource.h
dom/base/File.cpp
dom/base/File.h
dom/base/ImportManager.h
dom/base/MessageChannel.h
dom/base/MessagePortList.h
dom/base/Navigator.h
dom/base/NodeIterator.h
dom/base/SubtleCrypto.h
dom/base/TextInputProcessor.h
dom/base/URLSearchParams.h
dom/base/WebSocket.cpp
dom/base/nsContentPermissionHelper.h
dom/base/nsContentUtils.cpp
dom/base/nsDOMMutationObserver.h
dom/base/nsDOMScriptObjectFactory.h
dom/base/nsDOMSerializer.h
dom/base/nsDOMWindowUtils.h
dom/base/nsDocument.h
dom/base/nsFocusManager.h
dom/base/nsFormData.h
dom/base/nsFrameLoader.h
dom/base/nsFrameMessageManager.h
dom/base/nsGenConImageContent.cpp
dom/base/nsGlobalWindow.cpp
dom/base/nsLocation.h
dom/base/nsMimeTypeArray.h
dom/base/nsObjectLoadingContent.cpp
dom/base/nsPluginArray.h
dom/base/nsRange.h
dom/base/nsTextNode.cpp
dom/base/nsWindowMemoryReporter.h
dom/base/nsXMLHttpRequest.h
dom/bluetooth/BluetoothProfileManagerBase.h
dom/bluetooth2/BluetoothProfileManagerBase.h
dom/camera/DOMCameraCapabilities.h
dom/camera/DOMCameraControl.h
dom/camera/DOMCameraDetectedFace.h
dom/cellbroadcast/CellBroadcastMessage.h
dom/cellbroadcast/ipc/CellBroadcastIPCService.h
dom/cellbroadcast/ipc/CellBroadcastParent.h
dom/crypto/CryptoKey.h
dom/datastore/DataStoreService.h
dom/events/CustomEvent.h
dom/events/DOMEventTargetHelper.h
dom/events/DataTransfer.h
dom/events/IMEContentObserver.h
dom/events/ImageCaptureError.h
dom/events/MessageEvent.h
dom/events/PaintRequest.h
dom/events/Touch.h
dom/events/TouchEvent.h
dom/events/UIEvent.h
dom/fetch/Fetch.cpp
dom/fetch/FetchDriver.h
dom/fetch/Headers.h
dom/fetch/Request.h
dom/fetch/Response.h
dom/fmradio/FMRadio.cpp
dom/fmradio/FMRadio.h
dom/fmradio/FMRadioService.h
dom/fmradio/ipc/FMRadioChild.h
dom/fmradio/ipc/FMRadioParent.h
dom/fmradio/ipc/FMRadioRequestParent.h
dom/gamepad/Gamepad.h
dom/geolocation/nsGeoPosition.h
dom/geolocation/nsGeolocation.h
dom/html/HTMLAllCollection.h
dom/html/HTMLAnchorElement.h
dom/html/HTMLAreaElement.h
dom/html/HTMLBRElement.h
dom/html/HTMLBodyElement.h
dom/html/HTMLButtonElement.h
dom/html/HTMLCanvasElement.h
dom/html/HTMLDivElement.h
dom/html/HTMLFieldSetElement.h
dom/html/HTMLFormControlsCollection.h
dom/html/HTMLFormElement.h
dom/html/HTMLFrameElement.h
dom/html/HTMLFrameSetElement.h
dom/html/HTMLHRElement.h
dom/html/HTMLHeadingElement.h
dom/html/HTMLIFrameElement.h
dom/html/HTMLImageElement.h
dom/html/HTMLInputElement.h
dom/html/HTMLLIElement.h
dom/html/HTMLLabelElement.h
dom/html/HTMLLinkElement.h
dom/html/HTMLMapElement.h
dom/html/HTMLMediaElement.cpp
dom/html/HTMLMenuElement.h
dom/html/HTMLMenuItemElement.h
dom/html/HTMLMetaElement.h
dom/html/HTMLObjectElement.h
dom/html/HTMLOptGroupElement.h
dom/html/HTMLOptionElement.h
dom/html/HTMLOptionsCollection.h
dom/html/HTMLOutputElement.h
dom/html/HTMLParagraphElement.h
dom/html/HTMLPictureElement.h
dom/html/HTMLPreElement.h
dom/html/HTMLPropertiesCollection.h
dom/html/HTMLScriptElement.h
dom/html/HTMLSelectElement.h
dom/html/HTMLShadowElement.h
dom/html/HTMLSharedElement.h
dom/html/HTMLSharedListElement.h
dom/html/HTMLSharedObjectElement.h
dom/html/HTMLSourceElement.h
dom/html/HTMLStyleElement.h
dom/html/HTMLTableCaptionElement.h
dom/html/HTMLTableCellElement.h
dom/html/HTMLTableElement.h
dom/html/HTMLTextAreaElement.h
dom/html/HTMLTitleElement.h
dom/html/ImageDocument.h
dom/html/MediaError.h
dom/html/PluginDocument.cpp
dom/html/UndoManager.h
dom/html/ValidityState.h
dom/html/nsHTMLDNSPrefetch.h
dom/html/nsTextEditorState.cpp
dom/indexedDB/IDBFileHandle.h
dom/indexedDB/IDBFileRequest.h
dom/ipc/ContentBridgeChild.h
dom/ipc/ContentParent.cpp
dom/ipc/ContentParent.h
dom/ipc/TabChild.h
dom/ipc/TabParent.cpp
dom/mathml/nsMathMLElement.h
dom/media/MediaCache.cpp
dom/media/MediaManager.h
dom/media/MediaRecorder.h
dom/media/MediaResource.h
dom/media/MediaStreamError.h
dom/media/RTCIdentityProviderRegistrar.h
dom/media/RtspMediaResource.h
dom/media/TextTrackCueList.h
dom/media/TextTrackRegion.h
dom/media/WebVTTListener.h
dom/media/eme/MediaKeyStatusMap.h
dom/media/eme/MediaKeySystemAccess.h
dom/media/gmp/GMPAudioDecoderParent.h
dom/media/gmp/GMPVideoDecoderParent.h
dom/media/systemservices/LoadManager.h
dom/media/webaudio/AudioContext.h
dom/media/webaudio/AudioDestinationNode.h
dom/media/webaudio/AudioParam.h
dom/media/webspeech/recognition/SpeechGrammar.h
dom/media/webspeech/recognition/SpeechGrammarList.h
dom/media/webspeech/recognition/SpeechRecognition.h
dom/media/webspeech/recognition/SpeechRecognitionAlternative.h
dom/media/webspeech/recognition/SpeechRecognitionResult.h
dom/media/webspeech/recognition/SpeechRecognitionResultList.h
dom/media/webspeech/synth/SpeechSynthesis.h
dom/media/webspeech/synth/SpeechSynthesisVoice.h
dom/media/wmf/WMFByteStream.h
dom/mobileconnection/MobileCellInfo.h
dom/mobileconnection/MobileConnection.cpp
dom/mobileconnection/MobileConnection.h
dom/mobileconnection/MobileConnectionArray.h
dom/mobileconnection/MobileConnectionInfo.h
dom/mobileconnection/MobileNetworkInfo.h
dom/mobileconnection/ipc/MobileConnectionChild.h
dom/mobilemessage/MobileMessageManager.h
dom/mobilemessage/ipc/SmsIPCService.h
dom/network/Connection.h
dom/network/UDPSocket.h
dom/nfc/MozNDEFRecord.h
dom/nfc/gonk/NfcService.h
dom/notification/DesktopNotification.h
dom/offline/nsDOMOfflineResourceList.h
dom/plugins/base/nsPluginHost.h
dom/plugins/base/nsPluginInstanceOwner.h
dom/plugins/ipc/PluginModuleParent.cpp
dom/power/PowerManager.h
dom/presentation/PresentationDeviceManager.h
dom/quota/QuotaManager.cpp
dom/quota/QuotaManager.h
dom/quota/nsIOfflineStorage.h
dom/requestsync/RequestSyncWifiService.h
dom/security/nsCORSListenerProxy.cpp
dom/security/nsCORSListenerProxy.h
dom/security/nsCSPContext.h
dom/smil/TimeEvent.h
dom/smil/nsSMILAnimationController.h
dom/storage/DOMStorageIPC.h
dom/svg/DOMSVGAnimatedNumberList.h
dom/svg/DOMSVGLength.h
dom/svg/DOMSVGLengthList.h
dom/svg/DOMSVGNumber.h
dom/svg/DOMSVGNumberList.h
dom/svg/DOMSVGPathSeg.h
dom/svg/DOMSVGPathSegList.h
dom/svg/DOMSVGPointList.h
dom/svg/DOMSVGStringList.h
dom/svg/DOMSVGTransformList.h
dom/svg/SVGAElement.h
dom/svg/SVGAnimatedPreserveAspectRatio.h
dom/svg/SVGMPathElement.h
dom/svg/SVGPreserveAspectRatio.h
dom/svg/SVGScriptElement.h
dom/svg/SVGStyleElement.h
dom/svg/SVGSymbolElement.h
dom/svg/SVGTitleElement.h
dom/svg/SVGUseElement.h
dom/system/gonk/AudioManager.h
dom/system/gonk/SystemWorkerManager.h
dom/system/gonk/nsVolumeMountLock.h
dom/system/gonk/nsVolumeService.h
dom/telephony/CallsList.h
dom/telephony/MMICall.h
dom/telephony/Telephony.h
dom/telephony/TelephonyCallId.h
dom/telephony/TelephonyDialCallback.h
dom/telephony/USSDSession.h
dom/telephony/ipc/TelephonyIPCService.h
dom/time/TimeManager.h
dom/tv/TVProgram.h
dom/voicemail/Voicemail.h
dom/voicemail/VoicemailStatus.h
dom/voicemail/ipc/VoicemailIPCService.h
dom/voicemail/ipc/VoicemailParent.h
dom/wifi/WifiCertService.h
dom/workers/DataStore.h
dom/workers/ScriptLoader.cpp
dom/workers/ServiceWorkerClients.h
dom/workers/ServiceWorkerManager.cpp
dom/workers/WorkerScope.cpp
dom/workers/WorkerScope.h
dom/workers/XMLHttpRequest.cpp
dom/workers/XMLHttpRequest.h
dom/xbl/nsXBLService.cpp
dom/xml/CDATASection.h
dom/xslt/xpath/XPathResult.h
dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
dom/xslt/xslt/txMozillaXMLOutput.h
dom/xslt/xslt/txMozillaXSLTProcessor.h
dom/xslt/xslt/txStylesheetCompiler.h
dom/xul/XULDocument.h
dom/xul/nsXULContentSink.h
dom/xul/nsXULElement.cpp
dom/xul/nsXULElement.h
dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
dom/xul/templates/nsXULTemplateQueryProcessorXML.h
editor/composer/nsEditingSession.h
editor/libeditor/nsHTMLEditor.h
editor/txmgr/nsTransactionManager.h
editor/txtsvc/nsTextServicesDocument.h
embedding/browser/nsDocShellTreeOwner.h
embedding/browser/nsWebBrowser.h
embedding/components/printingui/ipc/PrintProgressDialogChild.h
embedding/components/printingui/ipc/PrintProgressDialogParent.h
extensions/cookie/nsPermissionManager.h
extensions/gio/nsGIOProtocolHandler.cpp
extensions/permissions/nsContentBlocker.h
extensions/spellcheck/hunspell/src/mozHunspell.h
extensions/spellcheck/src/mozInlineSpellChecker.h
extensions/spellcheck/src/mozPersonalDictionary.h
gfx/2d/ExtendInputEffectD2D1.h
gfx/2d/RadialGradientEffectD2D1.h
gfx/layers/client/ClientPaintedLayer.h
gfx/layers/client/ClientTiledPaintedLayer.h
gfx/layers/client/ContentClient.h
gfx/layers/composite/PaintedLayerComposite.h
gfx/layers/ipc/CompositorParent.cpp
gfx/layers/ipc/CompositorParent.h
gfx/layers/ipc/ImageBridgeChild.h
gfx/layers/ipc/ImageBridgeParent.h
gfx/layers/opengl/TextureHostOGL.h
gfx/thebes/gfxAndroidPlatform.cpp
gfx/thebes/gfxPlatform.cpp
image/decoders/icon/nsIconURI.h
image/src/RasterImage.h
image/src/SVGDocumentWrapper.h
image/src/VectorImage.h
image/src/imgLoader.h
image/src/imgRequest.h
ipc/bluetooth/BluetoothDaemonConnection.cpp
ipc/glue/MessagePump.cpp
ipc/glue/nsIIPCBackgroundChildCreateCallback.h
ipc/glue/nsIIPCSerializableInputStream.h
ipc/unixsocket/ListenSocket.cpp
ipc/unixsocket/StreamSocket.cpp
ipc/unixsocket/UnixSocket.cpp
js/src/jit/MIR.h
js/src/jsapi-tests/tests.h
js/xpconnect/src/xpcprivate.h
layout/base/SelectionCarets.h
layout/base/nsDocumentViewer.cpp
layout/base/nsLayoutHistoryState.cpp
layout/base/nsPresShell.h
layout/base/nsRefreshDriver.h
layout/forms/nsColorControlFrame.h
layout/forms/nsComboboxControlFrame.h
layout/forms/nsListControlFrame.h
layout/forms/nsNumberControlFrame.h
layout/forms/nsTextControlFrame.h
layout/generic/ScrollbarActivity.h
layout/generic/Selection.h
layout/generic/nsBulletFrame.h
layout/generic/nsCanvasFrame.h
layout/generic/nsGfxScrollFrame.h
layout/generic/nsImageFrame.h
layout/generic/nsImageMap.h
layout/ipc/VsyncParent.h
layout/printing/nsPagePrintTimer.h
layout/printing/nsPrintEngine.h
layout/style/CSSStyleSheet.h
layout/style/FontFace.h
layout/style/FontFaceSet.h
layout/style/ImageLoader.h
layout/style/ImportRule.h
layout/style/MediaQueryList.h
layout/style/NameSpaceRule.h
layout/style/nsCSSRules.h
layout/style/nsDOMCSSValueList.h
layout/style/nsICSSDeclaration.h
layout/style/nsIMediaList.h
layout/style/nsROCSSPrimitiveValue.h
layout/svg/nsSVGOuterSVGFrame.h
layout/xul/ListBoxObject.h
layout/xul/grid/nsGridLayout2.h
layout/xul/nsImageBoxFrame.h
layout/xul/nsListBoxBodyFrame.h
layout/xul/nsMenuPopupFrame.h
layout/xul/nsXULPopupManager.h
layout/xul/tree/TreeBoxObject.h
layout/xul/tree/nsTreeColumns.h
layout/xul/tree/nsTreeContentView.h
media/gmp-clearkey/0.1/ClearKeySessionManager.h
media/mtransport/transportflow.h
media/webrtc/signaling/src/jsep/JsepCodecDescription.h
media/webrtc/signaling/src/peerconnection/PeerConnectionImpl.h
media/webrtc/trunk/webrtc/modules/desktop_capture/desktop_and_cursor_composer.h
mobile/android/components/build/nsAndroidHistory.h
modules/libjar/nsJARChannel.h
modules/libjar/nsJARProtocolHandler.h
modules/libjar/nsJARURI.h
modules/libjar/zipwriter/nsZipWriter.h
modules/libpref/Preferences.cpp
modules/libpref/Preferences.h
netwerk/base/ProxyAutoConfig.cpp
netwerk/base/nsAsyncRedirectVerifyHelper.h
netwerk/base/nsAsyncStreamCopier.h
netwerk/base/nsIOService.h
netwerk/base/nsInputStreamPump.h
netwerk/base/nsPACMan.h
netwerk/base/nsProtocolProxyService.cpp
netwerk/base/nsProtocolProxyService.h
netwerk/base/nsSocketTransport2.h
netwerk/base/nsSocketTransportService2.h
netwerk/base/nsStreamListenerWrapper.h
netwerk/base/nsStreamLoader.h
netwerk/base/nsStreamTransportService.h
netwerk/base/nsSyncStreamListener.h
netwerk/base/nsUDPSocket.h
netwerk/cache/nsCacheService.h
netwerk/cache/nsDiskCacheDeviceSQL.h
netwerk/cache2/CacheEntry.h
netwerk/cache2/CacheStorageService.h
netwerk/cookie/nsCookieService.h
netwerk/dns/nsDNSService2.cpp
netwerk/dns/nsDNSService2.h
netwerk/protocol/ftp/FTPChannelParent.h
netwerk/protocol/ftp/nsFtpConnectionThread.h
netwerk/protocol/ftp/nsFtpProtocolHandler.h
netwerk/protocol/http/Http2Session.h
netwerk/protocol/http/HttpChannelChild.h
netwerk/protocol/http/SpdySession31.h
netwerk/protocol/http/SpdyStream31.h
netwerk/protocol/http/nsAHttpConnection.h
netwerk/protocol/http/nsHttpChannel.cpp
netwerk/protocol/http/nsHttpChannel.h
netwerk/protocol/http/nsHttpConnection.h
netwerk/protocol/http/nsHttpConnectionMgr.h
netwerk/protocol/http/nsHttpHandler.h
netwerk/protocol/http/nsHttpPipeline.h
netwerk/protocol/http/nsHttpTransaction.h
netwerk/protocol/rtsp/controller/RtspController.h
netwerk/protocol/viewsource/nsViewSourceChannel.h
netwerk/streamconv/converters/nsMultiMixedConv.h
netwerk/test/TestIncrementalDownload.cpp
parser/html/nsHtml5Parser.h
parser/html/nsHtml5TreeOpExecutor.h
parser/html/nsParserUtils.h
parser/htmlparser/nsParser.h
parser/xml/nsSAXXMLReader.h
rdf/base/nsRDFService.h
security/manager/ssl/src/PSMContentListener.h
security/manager/ssl/src/nsCertOverrideService.h
security/manager/ssl/src/nsClientAuthRemember.h
security/manager/ssl/src/nsNSSCertificate.h
security/manager/ssl/src/nsNSSCertificateDB.h
security/manager/ssl/src/nsNSSComponent.h
security/manager/ssl/src/nsNSSIOLayer.h
security/manager/ssl/src/nsRandomGenerator.h
storage/src/mozStorageAsyncStatement.h
storage/src/mozStorageAsyncStatementExecution.h
storage/src/mozStorageAsyncStatementParams.h
storage/src/mozStorageConnection.h
storage/src/mozStorageStatement.h
storage/src/mozStorageStatementParams.h
storage/src/mozStorageStatementRow.h
toolkit/components/autocomplete/nsAutoCompleteController.h
toolkit/components/diskspacewatcher/DiskSpaceWatcher.h
toolkit/components/downloads/nsDownloadManager.h
toolkit/components/filewatcher/NativeFileWatcherWin.h
toolkit/components/places/Database.h
toolkit/components/places/History.cpp
toolkit/components/places/History.h
toolkit/components/places/nsAnnotationService.h
toolkit/components/places/nsFaviconService.h
toolkit/components/places/nsNavBookmarks.h
toolkit/components/places/nsNavHistory.h
toolkit/components/places/nsNavHistoryResult.h
toolkit/components/satchel/nsFormFillController.h
toolkit/components/startup/nsAppStartup.h
toolkit/components/url-classifier/nsUrlClassifierDBService.cpp
toolkit/components/url-classifier/nsUrlClassifierDBService.h
toolkit/components/url-classifier/nsUrlClassifierStreamUpdater.h
toolkit/crashreporter/google-breakpad/src/common/linux/elf_symbols_to_module_unittest.cc
toolkit/xre/nsXREDirProvider.h
uriloader/base/nsURILoader.cpp
uriloader/exthandler/nsExternalHelperAppService.h
uriloader/prefetch/OfflineCacheUpdateGlue.h
uriloader/prefetch/nsOfflineCacheUpdate.cpp
uriloader/prefetch/nsOfflineCacheUpdate.h
uriloader/prefetch/nsOfflineCacheUpdateService.cpp
uriloader/prefetch/nsPrefetchService.h
widget/android/nsAndroidProtocolHandler.h
widget/gonk/nativewindow/GonkBufferQueueKK.h
widget/gtk/nsDragService.h
widget/nsColorPickerProxy.h
widget/nsScreenManagerProxy.h
widget/windows/nsTextStore.cpp
widget/windows/nsTextStore.h
xpcom/base/nsIStatusReporter.idl
xpcom/glue/nsCycleCollectionParticipant.h
xpcom/glue/nsISupportsImpl.h
xpcom/io/SnappyCompressOutputStream.h
xpcom/io/SnappyUncompressInputStream.h
xpcom/tests/TestCallTemplates.cpp
xpcom/tests/TestObserverService.cpp
xpfe/appshell/nsAppShellService.cpp
xpfe/appshell/nsAppShellService.h
xpfe/appshell/nsContentTreeOwner.h
xpfe/appshell/nsWebShellWindow.h
xpfe/components/directory/nsDirectoryViewer.h
xpfe/components/windowds/nsWindowDataSource.h
--- a/accessible/base/NotificationController.h
+++ b/accessible/base/NotificationController.h
@@ -81,17 +81,17 @@ private:
   Callback mCallback;
   nsRefPtr<Arg> mArg;
 };
 
 /**
  * Used to process notifications from core for the document accessible.
  */
 class NotificationController final : public EventQueue,
-                                         public nsARefreshObserver
+                                     public nsARefreshObserver
 {
 public:
   NotificationController(DocAccessible* aDocument, nsIPresShell* aPresShell);
 
   NS_IMETHOD_(MozExternalRefCountType) AddRef(void) override;
   NS_IMETHOD_(MozExternalRefCountType) Release(void) override;
 
   NS_DECL_CYCLE_COLLECTION_NATIVE_CLASS(NotificationController)
--- a/accessible/base/nsAccessibilityService.h
+++ b/accessible/base/nsAccessibilityService.h
@@ -59,20 +59,20 @@ struct MarkupMapInfo {
   a11y::role role;
   MarkupAttrInfo attrs[4];
 };
 
 } // namespace a11y
 } // namespace mozilla
 
 class nsAccessibilityService final : public mozilla::a11y::DocManager,
-                                         public mozilla::a11y::FocusManager,
-                                         public mozilla::a11y::SelectionManager,
-                                         public nsIAccessibilityService,
-                                         public nsIObserver
+                                     public mozilla::a11y::FocusManager,
+                                     public mozilla::a11y::SelectionManager,
+                                     public nsIAccessibilityService,
+                                     public nsIObserver
 {
 public:
   typedef mozilla::a11y::Accessible Accessible;
   typedef mozilla::a11y::DocAccessible DocAccessible;
 
 protected:
   virtual ~nsAccessibilityService();
 
--- a/accessible/windows/msaa/IUnknownImpl.h
+++ b/accessible/windows/msaa/IUnknownImpl.h
@@ -46,23 +46,23 @@ private:
 };
 
 } // namespace a11y
 } // namespace mozilla
 
 #define DECL_IUNKNOWN                                                          \
 public:                                                                        \
   virtual HRESULT STDMETHODCALLTYPE QueryInterface(REFIID, void**);            \
-  virtual ULONG STDMETHODCALLTYPE AddRef() final                           \
+  virtual ULONG STDMETHODCALLTYPE AddRef() final                               \
   {                                                                            \
     MOZ_ASSERT(int32_t(mRefCnt) >= 0, "illegal refcnt");                       \
     ++mRefCnt;                                                                 \
     return mRefCnt;                                                            \
   }                                                                            \
-  virtual ULONG STDMETHODCALLTYPE Release() final                          \
+  virtual ULONG STDMETHODCALLTYPE Release() final                              \
   {                                                                            \
      MOZ_ASSERT(int32_t(mRefCnt) > 0, "dup release");                          \
      --mRefCnt;                                                                \
      if (mRefCnt)                                                              \
        return mRefCnt;                                                         \
                                                                                \
      delete this;                                                              \
      return 0;                                                                 \
--- a/accessible/windows/uia/uiaRawElmProvider.h
+++ b/accessible/windows/uia/uiaRawElmProvider.h
@@ -16,17 +16,17 @@ namespace mozilla {
 namespace a11y {
 
 class AccessibleWrap;
 
 /**
  * IRawElementProviderSimple implementation (maintains IAccessibleEx approach).
  */
 class uiaRawElmProvider final : public IAccessibleEx,
-                                    public IRawElementProviderSimple
+                                public IRawElementProviderSimple
 {
 public:
   uiaRawElmProvider(AccessibleWrap* aAcc) : mAcc(aAcc) { }
 
   // IUnknown
   DECL_IUNKNOWN
 
   // IAccessibleEx
--- a/browser/components/feeds/nsFeedSniffer.h
+++ b/browser/components/feeds/nsFeedSniffer.h
@@ -5,17 +5,17 @@
 
 
 #include "nsIContentSniffer.h"
 #include "nsIStreamListener.h"
 #include "nsStringAPI.h"
 #include "mozilla/Attributes.h"
 
 class nsFeedSniffer final : public nsIContentSniffer,
-                                       nsIStreamListener
+                                   nsIStreamListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSICONTENTSNIFFER
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
 
   static NS_METHOD AppendSegmentToString(nsIInputStream* inputStream,
--- a/caps/nsNullPrincipalURI.h
+++ b/caps/nsNullPrincipalURI.h
@@ -20,18 +20,18 @@
 #include "mozilla/MemoryReporting.h"
 
 // {51fcd543-3b52-41f7-b91b-6b54102236e6}
 #define NS_NULLPRINCIPALURI_IMPLEMENTATION_CID \
   {0x51fcd543, 0x3b52, 0x41f7, \
     {0xb9, 0x1b, 0x6b, 0x54, 0x10, 0x22, 0x36, 0xe6} }
 
 class nsNullPrincipalURI final : public nsIURI
-                                   , public nsISizeOf
-                                   , public nsIIPCSerializableURI
+                               , public nsISizeOf
+                               , public nsIIPCSerializableURI
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIURI
   NS_DECL_NSIIPCSERIALIZABLEURI
 
   // nsISizeOf
   virtual size_t SizeOfExcludingThis(mozilla::MallocSizeOf aMallocSizeOf) const override;
--- a/caps/nsScriptSecurityManager.h
+++ b/caps/nsScriptSecurityManager.h
@@ -28,18 +28,18 @@ class ClassInfoData;
 /////////////////////////////
 // nsScriptSecurityManager //
 /////////////////////////////
 #define NS_SCRIPTSECURITYMANAGER_CID \
 { 0x7ee2a4c0, 0x4b93, 0x17d3, \
 { 0xba, 0x18, 0x00, 0x60, 0xb0, 0xf1, 0x99, 0xa2 }}
 
 class nsScriptSecurityManager final : public nsIScriptSecurityManager,
-                                          public nsIChannelEventSink,
-                                          public nsIObserver
+                                      public nsIChannelEventSink,
+                                      public nsIObserver
 {
 public:
     static void Shutdown();
 
     NS_DEFINE_STATIC_CID_ACCESSOR(NS_SCRIPTSECURITYMANAGER_CID)
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSISCRIPTSECURITYMANAGER
--- a/chrome/nsChromeProtocolHandler.h
+++ b/chrome/nsChromeProtocolHandler.h
@@ -14,17 +14,17 @@
 { /* 61ba33c0-3031-11d3-8cd0-0060b0fc14a3 */         \
     0x61ba33c0,                                      \
     0x3031,                                          \
     0x11d3,                                          \
     {0x8c, 0xd0, 0x00, 0x60, 0xb0, 0xfc, 0x14, 0xa3} \
 }
 
 class nsChromeProtocolHandler final : public nsIProtocolHandler,
-                                          public nsSupportsWeakReference
+                                      public nsSupportsWeakReference
 {
 public:
     NS_DECL_THREADSAFE_ISUPPORTS
 
     // nsIProtocolHandler methods:
     NS_DECL_NSIPROTOCOLHANDLER
 
     // nsChromeProtocolHandler methods:
--- a/docshell/shistory/src/nsSHEntry.h
+++ b/docshell/shistory/src/nsSHEntry.h
@@ -18,18 +18,18 @@
 #include "nsISHEntry.h"
 #include "nsISHContainer.h"
 
 class nsSHEntryShared;
 class nsIInputStream;
 class nsIURI;
 
 class nsSHEntry final : public nsISHEntry,
-                            public nsISHContainer,
-                            public nsISHEntryInternal
+                        public nsISHContainer,
+                        public nsISHEntryInternal
 {
 public: 
   nsSHEntry();
   nsSHEntry(const nsSHEntry &other);
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHENTRY
   NS_DECL_NSISHENTRYINTERNAL
--- a/docshell/shistory/src/nsSHEntryShared.h
+++ b/docshell/shistory/src/nsSHEntryShared.h
@@ -26,17 +26,17 @@ class nsISupportsArray;
 
 // A document may have multiple SHEntries, either due to hash navigations or
 // calls to history.pushState.  SHEntries corresponding to the same document
 // share many members; in particular, they share state related to the
 // back/forward cache.
 //
 // nsSHEntryShared is the vehicle for this sharing.
 class nsSHEntryShared final : public nsIBFCacheEntry,
-                                  public nsIMutationObserver
+                              public nsIMutationObserver
 {
   public:
     static void EnsureHistoryTracker();
     static void Shutdown();
 
     nsSHEntryShared();
 
     NS_DECL_ISUPPORTS
--- a/docshell/shistory/src/nsSHistory.h
+++ b/docshell/shistory/src/nsSHistory.h
@@ -23,19 +23,19 @@
 
 class nsIDocShell;
 class nsSHEnumerator;
 class nsSHistoryObserver;
 class nsISHEntry;
 class nsISHTransaction;
 
 class nsSHistory final : public PRCList,
-                             public nsISHistory,
-                             public nsISHistoryInternal,
-                             public nsIWebNavigation
+                         public nsISHistory,
+                         public nsISHistoryInternal,
+                         public nsIWebNavigation
 {
 public:
   nsSHistory();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISHISTORY
   NS_DECL_NSISHISTORYINTERNAL
   NS_DECL_NSIWEBNAVIGATION
--- a/dom/archivereader/ArchiveReader.h
+++ b/dom/archivereader/ArchiveReader.h
@@ -28,17 +28,17 @@ class GlobalObject;
 BEGIN_ARCHIVEREADER_NAMESPACE
 
 class ArchiveRequest;
 
 /**
  * This is the ArchiveReader object
  */
 class ArchiveReader final : public nsISupports,
-                                public nsWrapperCache
+                            public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(ArchiveReader)
 
   static already_AddRefed<ArchiveReader>
   Constructor(const GlobalObject& aGlobal, File& aBlob,
               const ArchiveReaderOptions& aOptions, ErrorResult& aError);
--- a/dom/archivereader/ArchiveZipFile.cpp
+++ b/dom/archivereader/ArchiveZipFile.cpp
@@ -16,17 +16,17 @@ using namespace mozilla::dom;
 USING_ARCHIVEREADER_NAMESPACE
 
 #define ZIP_CHUNK 16384
 
 /**
  * Input stream object for zip files
  */
 class ArchiveInputStream final : public nsIInputStream,
-                                     public nsISeekableStream
+                                 public nsISeekableStream
 {
 public:
   ArchiveInputStream(uint64_t aParentSize,
                      nsIInputStream* aInputStream,
                      nsString& aFilename,
                      uint32_t aStart,
                      uint32_t aLength,
                      ZipCentral& aCentral)
--- a/dom/asmjscache/AsmJSCache.cpp
+++ b/dom/asmjscache/AsmJSCache.cpp
@@ -1103,17 +1103,17 @@ FindHashMatch(const Metadata& aMetadata,
     return true;
   }
 
   return false;
 }
 
 // A runnable that executes for a cache access originating in the main process.
 class SingleProcessRunnable final : public File,
-                                        private MainProcessRunnable
+                                    private MainProcessRunnable
 {
 public:
   // In the single-process case, the calling JS compilation thread holds the
   // nsIPrincipal alive indirectly (via the global object -> compartment ->
   // principal) so we don't have to ref-count it here. This is fortunate since
   // we are off the main thread and nsIPrincipals can only be ref-counted on
   // the main thread.
   SingleProcessRunnable(nsIPrincipal* aPrincipal,
@@ -1181,17 +1181,17 @@ private:
 
   ReadParams mReadParams;
 };
 
 // A runnable that executes in a parent process for a cache access originating
 // in the content process. This runnable gets registered as an IPDL subprotocol
 // actor so that it can communicate with the corresponding ChildProcessRunnable.
 class ParentProcessRunnable final : public PAsmJSCacheEntryParent,
-                                        public MainProcessRunnable
+                                    public MainProcessRunnable
 {
 public:
   // The given principal comes from an IPC::Principal which will be dec-refed
   // at the end of the message, so we must ref-count it here. Fortunately, we
   // are on the main thread (where PContent messages are delivered).
   ParentProcessRunnable(nsIPrincipal* aPrincipal,
                         OpenMode aOpenMode,
                         WriteParams aWriteParams)
@@ -1352,17 +1352,17 @@ DeallocEntryParent(PAsmJSCacheEntryParen
   // Transfer ownership back from IPDL.
   nsRefPtr<ParentProcessRunnable> op =
     dont_AddRef(static_cast<ParentProcessRunnable*>(aActor));
 }
 
 namespace {
 
 class ChildProcessRunnable final : public File,
-                                       public PAsmJSCacheEntryChild
+                                   public PAsmJSCacheEntryChild
 {
 public:
   NS_DECL_NSIRUNNABLE
 
   // In the single-process case, the calling JS compilation thread holds the
   // nsIPrincipal alive indirectly (via the global object -> compartment ->
   // principal) so we don't have to ref-count it here. This is fortunate since
   // we are off the main thread and nsIPrincipals can only be ref-counted on
--- a/dom/base/Attr.h
+++ b/dom/base/Attr.h
@@ -24,17 +24,17 @@ class nsIDocument;
 
 namespace mozilla {
 class EventChainPreVisitor;
 namespace dom {
 
 // Attribute helper class used to wrap up an attribute with a dom
 // object that implements nsIDOMAttr and nsIDOMNode
 class Attr final : public nsIAttribute,
-                       public nsIDOMAttr
+                   public nsIDOMAttr
 {
   virtual ~Attr() {}
 
 public:
   Attr(nsDOMAttributeMap* aAttrMap,
        already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
        const nsAString& aValue,
        bool aNsAware);
--- a/dom/base/Comment.h
+++ b/dom/base/Comment.h
@@ -9,17 +9,17 @@
 #include "mozilla/Attributes.h"
 #include "nsIDOMComment.h"
 #include "nsGenericDOMDataNode.h"
 
 namespace mozilla {
 namespace dom {
 
 class Comment final : public nsGenericDOMDataNode,
-                          public nsIDOMComment
+                      public nsIDOMComment
 {
 private:
   void Init()
   {
     MOZ_ASSERT(mNodeInfo->NodeType() == nsIDOMNode::COMMENT_NODE,
                "Bad NodeType in aNodeInfo");
   }
 
--- a/dom/base/Console.h
+++ b/dom/base/Console.h
@@ -21,17 +21,17 @@ class nsIXPConnectJSObjectHolder;
 
 namespace mozilla {
 namespace dom {
 
 class ConsoleCallData;
 struct ConsoleStackEntry;
 
 class Console final : public nsIObserver
-                        , public nsWrapperCache
+                    , public nsWrapperCache
 {
   ~Console();
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Console)
   NS_DECL_NSIOBSERVER
 
--- a/dom/base/DOMImplementation.h
+++ b/dom/base/DOMImplementation.h
@@ -20,17 +20,17 @@
 
 class nsIDOMDocument;
 
 namespace mozilla {
 namespace dom {
 class DocumentType;
 
 class DOMImplementation final : public nsIDOMDOMImplementation
-                                  , public nsWrapperCache
+                              , public nsWrapperCache
 {
   ~DOMImplementation()
   {
   }
 
 public:
   DOMImplementation(nsIDocument* aOwner,
                     nsIGlobalObject* aScriptObject,
--- a/dom/base/DOMParser.h
+++ b/dom/base/DOMParser.h
@@ -16,18 +16,18 @@
 #include "mozilla/dom/TypedArray.h"
 
 class nsIDocument;
 
 namespace mozilla {
 namespace dom {
 
 class DOMParser final : public nsIDOMParser,
-                            public nsSupportsWeakReference,
-                            public nsWrapperCache
+                        public nsSupportsWeakReference,
+                        public nsWrapperCache
 {
   typedef mozilla::dom::GlobalObject GlobalObject;
 
   virtual ~DOMParser();
 
 public: 
   DOMParser();
 
--- a/dom/base/DOMRect.h
+++ b/dom/base/DOMRect.h
@@ -71,17 +71,17 @@ public:
     return std::max(y, y + h);
   }
 
 protected:
   nsCOMPtr<nsISupports> mParent;
 };
 
 class DOMRect final : public DOMRectReadOnly
-                        , public nsIDOMClientRect
+                    , public nsIDOMClientRect
 {
 public:
   explicit DOMRect(nsISupports* aParent, double aX = 0, double aY = 0,
                    double aWidth = 0, double aHeight = 0)
     : DOMRectReadOnly(aParent)
     , mX(aX)
     , mY(aY)
     , mWidth(aWidth)
@@ -142,17 +142,17 @@ public:
 protected:
   double mX, mY, mWidth, mHeight;
 
 private:
   ~DOMRect() {};
 };
 
 class DOMRectList final : public nsIDOMClientRectList,
-                              public nsWrapperCache
+                          public nsWrapperCache
 {
   ~DOMRectList() {}
 
 public:
   explicit DOMRectList(nsISupports *aParent) : mParent(aParent)
   {
   }
 
--- a/dom/base/Element.h
+++ b/dom/base/Element.h
@@ -1462,345 +1462,339 @@ nsresult                                
   NS_IMETHODIMP                                                       \
   _class::Set##_method(bool aValue)                                   \
   {                                                                   \
     return SetBoolAttr(nsGkAtoms::_atom, aValue);                     \
   }
 
 #define NS_FORWARD_NSIDOMELEMENT_TO_GENERIC                                   \
 typedef mozilla::dom::Element Element;                                        \
-NS_IMETHOD GetTagName(nsAString& aTagName) final override             \
+NS_IMETHOD GetTagName(nsAString& aTagName) final override                     \
 {                                                                             \
   Element::GetTagName(aTagName);                                              \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetId(nsAString& aId) final override                       \
+NS_IMETHOD GetId(nsAString& aId) final override                               \
 {                                                                             \
   Element::GetId(aId);                                                        \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD SetId(const nsAString& aId) final override                 \
+NS_IMETHOD SetId(const nsAString& aId) final override                         \
 {                                                                             \
   Element::SetId(aId);                                                        \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClassName(nsAString& aClassName) final override         \
+NS_IMETHOD GetClassName(nsAString& aClassName) final override                 \
 {                                                                             \
   Element::GetClassName(aClassName);                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD SetClassName(const nsAString& aClassName) final override   \
+NS_IMETHOD SetClassName(const nsAString& aClassName) final override           \
 {                                                                             \
   Element::SetClassName(aClassName);                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClassList(nsISupports** aClassList) final override      \
+NS_IMETHOD GetClassList(nsISupports** aClassList) final override              \
 {                                                                             \
   Element::GetClassList(aClassList);                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) final       \
-  override                                                                \
+NS_IMETHOD GetAttributes(nsIDOMMozNamedAttrMap** aAttributes) final override  \
 {                                                                             \
   NS_ADDREF(*aAttributes = Attributes());                                     \
   return NS_OK;                                                               \
 }                                                                             \
 using Element::GetAttribute;                                                  \
-NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final  \
-  override                                                                \
+NS_IMETHOD GetAttribute(const nsAString& name, nsAString& _retval) final      \
+  override                                                                    \
 {                                                                             \
   nsString attr;                                                              \
   GetAttribute(name, attr);                                                   \
   _retval = attr;                                                             \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD GetAttributeNS(const nsAString& namespaceURI,                      \
                           const nsAString& localName,                         \
-                          nsAString& _retval) final override          \
+                          nsAString& _retval) final override                  \
 {                                                                             \
   Element::GetAttributeNS(namespaceURI, localName, _retval);                  \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD SetAttribute(const nsAString& name,                                \
-                        const nsAString& value) override                  \
+                        const nsAString& value) override                      \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   Element::SetAttribute(name, value, rv);                                     \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 NS_IMETHOD SetAttributeNS(const nsAString& namespaceURI,                      \
                           const nsAString& qualifiedName,                     \
-                          const nsAString& value) final override      \
+                          const nsAString& value) final override              \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   Element::SetAttributeNS(namespaceURI, qualifiedName, value, rv);            \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 using Element::RemoveAttribute;                                               \
-NS_IMETHOD RemoveAttribute(const nsAString& name) final override      \
+NS_IMETHOD RemoveAttribute(const nsAString& name) final override              \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   RemoveAttribute(name, rv);                                                  \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 NS_IMETHOD RemoveAttributeNS(const nsAString& namespaceURI,                   \
-                             const nsAString& localName) final            \
-  override                                                                \
+                             const nsAString& localName) final override       \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   Element::RemoveAttributeNS(namespaceURI, localName, rv);                    \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 using Element::HasAttribute;                                                  \
 NS_IMETHOD HasAttribute(const nsAString& name,                                \
-                           bool* _retval) final override              \
+                           bool* _retval) final override                      \
 {                                                                             \
   *_retval = HasAttribute(name);                                              \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD HasAttributeNS(const nsAString& namespaceURI,                      \
                           const nsAString& localName,                         \
-                          bool* _retval) final override               \
+                          bool* _retval) final override                       \
 {                                                                             \
   *_retval = Element::HasAttributeNS(namespaceURI, localName);                \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD HasAttributes(bool* _retval) final override                \
+NS_IMETHOD HasAttributes(bool* _retval) final override                        \
 {                                                                             \
   *_retval = Element::HasAttributes();                                        \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD GetAttributeNode(const nsAString& name,                            \
-                            nsIDOMAttr** _retval) final override      \
+                            nsIDOMAttr** _retval) final override              \
 {                                                                             \
   NS_IF_ADDREF(*_retval = Element::GetAttributeNode(name));                   \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD SetAttributeNode(nsIDOMAttr* newAttr,                              \
-                            nsIDOMAttr** _retval) final override      \
+                            nsIDOMAttr** _retval) final override              \
 {                                                                             \
   if (!newAttr) {                                                             \
     return NS_ERROR_INVALID_POINTER;                                          \
   }                                                                           \
   mozilla::ErrorResult rv;                                                    \
   mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(newAttr);       \
   *_retval = Element::SetAttributeNode(*attr, rv).take();                     \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 NS_IMETHOD RemoveAttributeNode(nsIDOMAttr* oldAttr,                           \
-                               nsIDOMAttr** _retval) final override   \
+                               nsIDOMAttr** _retval) final override           \
 {                                                                             \
   if (!oldAttr) {                                                             \
     return NS_ERROR_INVALID_POINTER;                                          \
   }                                                                           \
   mozilla::ErrorResult rv;                                                    \
   mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(oldAttr);       \
   *_retval = Element::RemoveAttributeNode(*attr, rv).take();                  \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 NS_IMETHOD GetAttributeNodeNS(const nsAString& namespaceURI,                  \
                               const nsAString& localName,                     \
-                              nsIDOMAttr** _retval) final override    \
+                              nsIDOMAttr** _retval) final override            \
 {                                                                             \
   NS_IF_ADDREF(*_retval = Element::GetAttributeNodeNS(namespaceURI,           \
                                                       localName));            \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD SetAttributeNodeNS(nsIDOMAttr* newAttr,                            \
-                              nsIDOMAttr** _retval) final override    \
+                              nsIDOMAttr** _retval) final override            \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   mozilla::dom::Attr* attr = static_cast<mozilla::dom::Attr*>(newAttr);       \
   *_retval = Element::SetAttributeNodeNS(*attr, rv).take();                   \
   return rv.ErrorCode();                                                      \
 }                                                                             \
 NS_IMETHOD GetElementsByTagName(const nsAString& name,                        \
-                                nsIDOMHTMLCollection** _retval) final     \
-                                                                override  \
+                                nsIDOMHTMLCollection** _retval) final         \
+                                                                override      \
 {                                                                             \
   Element::GetElementsByTagName(name, _retval);                               \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD GetElementsByTagNameNS(const nsAString& namespaceURI,              \
                                   const nsAString& localName,                 \
-                                  nsIDOMHTMLCollection** _retval) final   \
-                                                                  override\
+                                  nsIDOMHTMLCollection** _retval) final       \
+                                                                  override    \
 {                                                                             \
   return Element::GetElementsByTagNameNS(namespaceURI, localName,             \
                                          _retval);                            \
 }                                                                             \
 NS_IMETHOD GetElementsByClassName(const nsAString& classes,                   \
-                                  nsIDOMHTMLCollection** _retval) final   \
-                                                                  override\
+                                  nsIDOMHTMLCollection** _retval) final       \
+                                                                  override    \
 {                                                                             \
   return Element::GetElementsByClassName(classes, _retval);                   \
 }                                                                             \
-NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) final        \
-  override                                                                \
+NS_IMETHOD GetChildElements(nsIDOMNodeList** aChildElements) final override   \
 {                                                                             \
   nsIHTMLCollection* list = FragmentOrElement::Children();                    \
   return CallQueryInterface(list, aChildElements);                            \
 }                                                                             \
-NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final \
-  override                                                                \
+NS_IMETHOD GetFirstElementChild(nsIDOMElement** aFirstElementChild) final     \
+  override                                                                    \
 {                                                                             \
   Element* element = Element::GetFirstElementChild();                         \
   if (!element) {                                                             \
     *aFirstElementChild = nullptr;                                            \
     return NS_OK;                                                             \
   }                                                                           \
   return CallQueryInterface(element, aFirstElementChild);                     \
 }                                                                             \
-NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final   \
-  override                                                                \
+NS_IMETHOD GetLastElementChild(nsIDOMElement** aLastElementChild) final       \
+  override                                                                    \
 {                                                                             \
   Element* element = Element::GetLastElementChild();                          \
   if (!element) {                                                             \
     *aLastElementChild = nullptr;                                             \
     return NS_OK;                                                             \
   }                                                                           \
   return CallQueryInterface(element, aLastElementChild);                      \
 }                                                                             \
 NS_IMETHOD GetPreviousElementSibling(nsIDOMElement** aPreviousElementSibling) \
-  final override                                                      \
+  final override                                                              \
 {                                                                             \
   Element* element = Element::GetPreviousElementSibling();                    \
   if (!element) {                                                             \
     *aPreviousElementSibling = nullptr;                                       \
     return NS_OK;                                                             \
   }                                                                           \
   return CallQueryInterface(element, aPreviousElementSibling);                \
 }                                                                             \
 NS_IMETHOD GetNextElementSibling(nsIDOMElement** aNextElementSibling)         \
-  final override                                                      \
+  final override                                                              \
 {                                                                             \
   Element* element = Element::GetNextElementSibling();                        \
   if (!element) {                                                             \
     *aNextElementSibling = nullptr;                                           \
     return NS_OK;                                                             \
   }                                                                           \
   return CallQueryInterface(element, aNextElementSibling);                    \
 }                                                                             \
-NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) final       \
-  override                                                                \
+NS_IMETHOD GetChildElementCount(uint32_t* aChildElementCount) final override  \
 {                                                                             \
   *aChildElementCount = Element::ChildElementCount();                         \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD MozRemove() final override                                 \
+NS_IMETHOD MozRemove() final override                                         \
 {                                                                             \
   nsINode::Remove();                                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) final           \
-  override                                                                \
+NS_IMETHOD GetClientRects(nsIDOMClientRectList** _retval) final override      \
 {                                                                             \
   *_retval = Element::GetClientRects().take();                                \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) final        \
-  override                                                                \
+NS_IMETHOD GetBoundingClientRect(nsIDOMClientRect** _retval) final override   \
 {                                                                             \
   *_retval = Element::GetBoundingClientRect().take();                         \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollTop(int32_t* aScrollTop) final override           \
+NS_IMETHOD GetScrollTop(int32_t* aScrollTop) final override                   \
 {                                                                             \
   *aScrollTop = Element::ScrollTop();                                         \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD SetScrollTop(int32_t aScrollTop) final override            \
+NS_IMETHOD SetScrollTop(int32_t aScrollTop) final override                    \
 {                                                                             \
   Element::SetScrollTop(aScrollTop);                                          \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) final override         \
+NS_IMETHOD GetScrollLeft(int32_t* aScrollLeft) final override                 \
 {                                                                             \
   *aScrollLeft = Element::ScrollLeft();                                       \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) final override          \
+NS_IMETHOD SetScrollLeft(int32_t aScrollLeft) final override                  \
 {                                                                             \
   Element::SetScrollLeft(aScrollLeft);                                        \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) final override       \
+NS_IMETHOD GetScrollWidth(int32_t* aScrollWidth) final override               \
 {                                                                             \
   *aScrollWidth = Element::ScrollWidth();                                     \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) final override     \
+NS_IMETHOD GetScrollHeight(int32_t* aScrollHeight) final override             \
 {                                                                             \
   *aScrollHeight = Element::ScrollHeight();                                   \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientTop(int32_t* aClientTop) final override           \
+NS_IMETHOD GetClientTop(int32_t* aClientTop) final override                   \
 {                                                                             \
   *aClientTop = Element::ClientTop();                                         \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientLeft(int32_t* aClientLeft) final override         \
+NS_IMETHOD GetClientLeft(int32_t* aClientLeft) final override                 \
 {                                                                             \
   *aClientLeft = Element::ClientLeft();                                       \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientWidth(int32_t* aClientWidth) final override       \
+NS_IMETHOD GetClientWidth(int32_t* aClientWidth) final override               \
 {                                                                             \
   *aClientWidth = Element::ClientWidth();                                     \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetClientHeight(int32_t* aClientHeight) final override     \
+NS_IMETHOD GetClientHeight(int32_t* aClientHeight) final override             \
 {                                                                             \
   *aClientHeight = Element::ClientHeight();                                   \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) final override   \
+NS_IMETHOD GetScrollLeftMax(int32_t* aScrollLeftMax) final override           \
 {                                                                             \
   *aScrollLeftMax = Element::ScrollLeftMax();                                 \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) final override     \
+NS_IMETHOD GetScrollTopMax(int32_t* aScrollTopMax) final override             \
 {                                                                             \
   *aScrollTopMax = Element::ScrollTopMax();                                   \
   return NS_OK;                                                               \
 }                                                                             \
 NS_IMETHOD MozMatchesSelector(const nsAString& selector,                      \
-                              bool* _retval) final override           \
+                              bool* _retval) final override                   \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   *_retval = Element::MozMatchesSelector(selector, rv);                       \
   return rv.ErrorCode();                                                      \
 }                                                                             \
-NS_IMETHOD SetCapture(bool retargetToElement) final override          \
+NS_IMETHOD SetCapture(bool retargetToElement) final override                  \
 {                                                                             \
   Element::SetCapture(retargetToElement);                                     \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD ReleaseCapture(void) final override                        \
+NS_IMETHOD ReleaseCapture(void) final override                                \
 {                                                                             \
   Element::ReleaseCapture();                                                  \
   return NS_OK;                                                               \
 }                                                                             \
-NS_IMETHOD MozRequestFullScreen(void) final override                  \
+NS_IMETHOD MozRequestFullScreen(void) final override                          \
 {                                                                             \
   mozilla::ErrorResult rv;                                                    \
   Element::MozRequestFullScreen(nullptr, JS::UndefinedHandleValue, rv);       \
   return rv.ErrorCode();                                                      \
 }                                                                             \
-NS_IMETHOD MozRequestPointerLock(void) final override                 \
+NS_IMETHOD MozRequestPointerLock(void) final override                         \
 {                                                                             \
   Element::MozRequestPointerLock();                                           \
   return NS_OK;                                                               \
 }                                                                             \
 using nsINode::QuerySelector;                                                 \
 NS_IMETHOD QuerySelector(const nsAString& aSelector,                          \
-                         nsIDOMElement **aReturn) final override      \
+                         nsIDOMElement **aReturn) final override              \
 {                                                                             \
   return nsINode::QuerySelector(aSelector, aReturn);                          \
 }                                                                             \
 using nsINode::QuerySelectorAll;                                              \
 NS_IMETHOD QuerySelectorAll(const nsAString& aSelector,                       \
-                            nsIDOMNodeList **aReturn) final override  \
+                            nsIDOMNodeList **aReturn) final override          \
 {                                                                             \
   return nsINode::QuerySelectorAll(aSelector, aReturn);                       \
 }
 
 #endif // mozilla_dom_Element_h__
--- a/dom/base/EventSource.h
+++ b/dom/base/EventSource.h
@@ -32,21 +32,21 @@ namespace mozilla {
 class ErrorResult;
 
 namespace dom {
 
 class AsyncVerifyRedirectCallbackFwr;
 struct EventSourceInit;
 
 class EventSource final : public DOMEventTargetHelper
-                            , public nsIObserver
-                            , public nsIStreamListener
-                            , public nsIChannelEventSink
-                            , public nsIInterfaceRequestor
-                            , public nsSupportsWeakReference
+                        , public nsIObserver
+                        , public nsIStreamListener
+                        , public nsIChannelEventSink
+                        , public nsIInterfaceRequestor
+                        , public nsSupportsWeakReference
 {
 friend class AsyncVerifyRedirectCallbackFwr;
 
 public:
   explicit EventSource(nsPIDOMWindow* aOwnerWindow);
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_SKIPPABLE_SCRIPT_HOLDER_CLASS_INHERITED(
     EventSource, DOMEventTargetHelper)
--- a/dom/base/File.cpp
+++ b/dom/base/File.cpp
@@ -47,18 +47,18 @@ namespace mozilla {
 namespace dom {
 
 // XXXkhuey the input stream that we pass out of a File
 // can outlive the actual File object.  Thus, we must
 // ensure that the buffer underlying the stream we get
 // from NS_NewByteInputStream is held alive as long as the
 // stream is.  We do that by passing back this class instead.
 class DataOwnerAdapter final : public nsIInputStream,
-                                   public nsISeekableStream,
-                                   public nsIIPCSerializableInputStream
+                               public nsISeekableStream,
+                               public nsIIPCSerializableInputStream
 {
   typedef FileImplMemory::DataOwner DataOwner;
 public:
   static nsresult Create(DataOwner* aDataOwner,
                          uint32_t aStart,
                          uint32_t aLength,
                          nsIInputStream** _retval);
 
--- a/dom/base/File.h
+++ b/dom/base/File.h
@@ -47,20 +47,20 @@ class FileInfo;
 
 struct BlobPropertyBag;
 struct ChromeFilePropertyBag;
 struct FilePropertyBag;
 class FileImpl;
 class OwningArrayBufferOrArrayBufferViewOrBlobOrString;
 
 class File final : public nsIDOMFile
-                     , public nsIXHRSendable
-                     , public nsIMutable
-                     , public nsSupportsWeakReference
-                     , public nsWrapperCache
+                 , public nsIXHRSendable
+                 , public nsIMutable
+                 , public nsSupportsWeakReference
+                 , public nsWrapperCache
 {
 public:
   NS_DECL_NSIDOMBLOB
   NS_DECL_NSIDOMFILE
   NS_DECL_NSIXHRSENDABLE
   NS_DECL_NSIMUTABLE
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
@@ -519,17 +519,18 @@ public:
   CreateSlice(uint64_t aStart, uint64_t aLength,
               const nsAString& aContentType, ErrorResult& aRv) override;
 
   virtual bool IsMemoryFile() const override
   {
     return true;
   }
 
-  class DataOwner final : public mozilla::LinkedListElement<DataOwner> {
+  class DataOwner final : public mozilla::LinkedListElement<DataOwner>
+  {
   public:
     NS_INLINE_DECL_THREADSAFE_REFCOUNTING(DataOwner)
     DataOwner(void* aMemoryBuffer, uint64_t aLength)
       : mData(aMemoryBuffer)
       , mLength(aLength)
     {
       mozilla::StaticMutexAutoLock lock(sDataOwnerMutex);
 
@@ -809,17 +810,17 @@ private:
 
   nsCOMPtr<nsIFile> mFile;
   bool mWholeFile;
   bool mStoredFile;
   bool mIsTemporary;
 };
 
 class FileList final : public nsIDOMFileList,
-                           public nsWrapperCache
+                       public nsWrapperCache
 {
   ~FileList() {}
 
 public:
   explicit FileList(nsISupports *aParent) : mParent(aParent)
   {
   }
 
--- a/dom/base/ImportManager.h
+++ b/dom/base/ImportManager.h
@@ -57,17 +57,17 @@ class AutoError;
 namespace mozilla {
 namespace dom {
 
 class ImportManager;
 
 typedef nsTHashtable<nsPtrHashKey<nsINode>> NodeTable;
 
 class ImportLoader final : public nsIStreamListener
-                             , public nsIDOMEventListener
+                         , public nsIDOMEventListener
 {
 
   // A helper inner class to decouple the logic of updating the import graph
   // after a new import link has been found by one of the parsers.
   class Updater {
 
   public:
     explicit Updater(ImportLoader* aLoader) : mLoader(aLoader)
--- a/dom/base/MessageChannel.h
+++ b/dom/base/MessageChannel.h
@@ -17,17 +17,17 @@
 class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 
 class MessagePort;
 
 class MessageChannel final : public nsISupports
-                               , public nsWrapperCache
+                           , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MessageChannel)
 
   static bool Enabled(JSContext* aCx, JSObject* aGlobal);
 
 public:
--- a/dom/base/MessagePortList.h
+++ b/dom/base/MessagePortList.h
@@ -14,17 +14,17 @@
 #include "nsWrapperCache.h"
 #include "nsAutoPtr.h"
 #include "nsTArray.h"
 
 namespace mozilla {
 namespace dom {
 
 class MessagePortList final : public nsISupports
-                                , public nsWrapperCache
+                            , public nsWrapperCache
 {
   ~MessagePortList() {}
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MessagePortList)
 
 public:
--- a/dom/base/Navigator.h
+++ b/dom/base/Navigator.h
@@ -104,18 +104,18 @@ class TimeManager;
 
 namespace system {
 #ifdef MOZ_AUDIO_CHANNEL_MANAGER
 class AudioChannelManager;
 #endif
 } // namespace system
 
 class Navigator final : public nsIDOMNavigator
-                          , public nsIMozNavigatorNetwork
-                          , public nsWrapperCache
+                      , public nsIMozNavigatorNetwork
+                      , public nsWrapperCache
 {
 public:
   explicit Navigator(nsPIDOMWindow* aInnerWindow);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Navigator,
                                                          nsIDOMNavigator)
   NS_DECL_NSIDOMNAVIGATOR
--- a/dom/base/NodeIterator.h
+++ b/dom/base/NodeIterator.h
@@ -18,18 +18,18 @@
 
 class nsINode;
 class nsIDOMNode;
 
 namespace mozilla {
 namespace dom {
 
 class NodeIterator final : public nsIDOMNodeIterator,
-                               public nsTraversal,
-                               public nsStubMutationObserver
+                           public nsTraversal,
+                           public nsStubMutationObserver
 {
 public:
     NS_DECL_CYCLE_COLLECTING_ISUPPORTS
     NS_DECL_NSIDOMNODEITERATOR
 
     NodeIterator(nsINode *aRoot,
                  uint32_t aWhatToShow,
                  const NodeFilterHolder &aFilter);
--- a/dom/base/SubtleCrypto.h
+++ b/dom/base/SubtleCrypto.h
@@ -17,17 +17,17 @@ namespace mozilla {
 namespace dom {
 
 class ObjectOrString;
 class Promise;
 
 typedef ArrayBufferViewOrArrayBuffer CryptoOperationData;
 
 class SubtleCrypto final : public nsISupports,
-                               public nsWrapperCache
+                           public nsWrapperCache
 {
   ~SubtleCrypto() {}
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SubtleCrypto)
 
 public:
--- a/dom/base/TextInputProcessor.h
+++ b/dom/base/TextInputProcessor.h
@@ -16,17 +16,17 @@
 
 namespace mozilla {
 
 namespace widget{
 class TextEventDispatcher;
 } // namespace widget
 
 class TextInputProcessor final : public nsITextInputProcessor
-                                   , public widget::TextEventDispatcherListener
+                               , public widget::TextEventDispatcherListener
 {
   typedef mozilla::widget::IMENotification IMENotification;
   typedef mozilla::widget::TextEventDispatcher TextEventDispatcher;
 
 public:
   TextInputProcessor();
 
   NS_DECL_ISUPPORTS
--- a/dom/base/URLSearchParams.h
+++ b/dom/base/URLSearchParams.h
@@ -22,17 +22,17 @@ class URLSearchParamsObserver : public n
 {
 public:
   virtual ~URLSearchParamsObserver() {}
 
   virtual void URLSearchParamsUpdated(URLSearchParams* aFromThis) = 0;
 };
 
 class URLSearchParams final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
   ~URLSearchParams();
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(URLSearchParams)
 
   URLSearchParams();
--- a/dom/base/WebSocket.cpp
+++ b/dom/base/WebSocket.cpp
@@ -57,21 +57,21 @@
 
 using namespace mozilla::net;
 using namespace mozilla::dom::workers;
 
 namespace mozilla {
 namespace dom {
 
 class WebSocketImpl final : public nsIInterfaceRequestor
-                              , public nsIWebSocketListener
-                              , public nsIObserver
-                              , public nsSupportsWeakReference
-                              , public nsIRequest
-                              , public nsIEventTarget
+                          , public nsIWebSocketListener
+                          , public nsIObserver
+                          , public nsSupportsWeakReference
+                          , public nsIRequest
+                          , public nsIEventTarget
 {
 public:
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSIWEBSOCKETLISTENER
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIREQUEST
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIEVENTTARGET
--- a/dom/base/nsContentPermissionHelper.h
+++ b/dom/base/nsContentPermissionHelper.h
@@ -102,17 +102,17 @@ class nsContentPermissionRequestProxy : 
   mozilla::dom::ContentPermissionRequestParent* mParent;
   nsTArray<mozilla::dom::PermissionRequest> mPermissionRequests;
 };
 
 /**
  * RemotePermissionRequest will send a prompt ipdl request to b2g process.
  */
 class RemotePermissionRequest final : public nsISupports
-                                        , public mozilla::dom::PContentPermissionRequestChild
+                                    , public mozilla::dom::PContentPermissionRequestChild
 {
 public:
   NS_DECL_ISUPPORTS
 
   RemotePermissionRequest(nsIContentPermissionRequest* aRequest,
                           nsPIDOMWindow* aWindow);
 
   // It will be called when prompt dismissed.
--- a/dom/base/nsContentUtils.cpp
+++ b/dom/base/nsContentUtils.cpp
@@ -394,17 +394,17 @@ EventListenerManagerHashClearEntry(PLDHa
   EventListenerManagerMapEntry *lm =
     static_cast<EventListenerManagerMapEntry *>(entry);
 
   // Let the EventListenerManagerMapEntry clean itself up...
   lm->~EventListenerManagerMapEntry();
 }
 
 class SameOriginCheckerImpl final : public nsIChannelEventSink,
-                                        public nsIInterfaceRequestor
+                                    public nsIInterfaceRequestor
 {
   ~SameOriginCheckerImpl() {}
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSICHANNELEVENTSINK
   NS_DECL_NSIINTERFACEREQUESTOR
 };
 
--- a/dom/base/nsDOMMutationObserver.h
+++ b/dom/base/nsDOMMutationObserver.h
@@ -26,17 +26,17 @@
 #include "nsIDocument.h"
 #include "mozilla/dom/AnimationPlayer.h"
 #include "nsIAnimationObserver.h"
 
 class nsDOMMutationObserver;
 using mozilla::dom::MutationObservingInfo;
 
 class nsDOMMutationRecord final : public nsISupports,
-                                      public nsWrapperCache
+                                  public nsWrapperCache
 {
   virtual ~nsDOMMutationRecord() {}
 
 public:
   typedef nsTArray<nsRefPtr<mozilla::dom::AnimationPlayer>> AnimationPlayerArray;
 
   nsDOMMutationRecord(nsIAtom* aType, nsISupports* aOwner)
   : mType(aType), mAttrNamespace(NullString()), mPrevValue(NullString()), mOwner(aOwner)
@@ -438,17 +438,17 @@ private:
                                AnimationMutation aMutationType);
 };
 
 #define NS_DOM_MUTATION_OBSERVER_IID \
 { 0x0c3b91f8, 0xcc3b, 0x4b08, \
   { 0x9e, 0xab, 0x07, 0x47, 0xa9, 0xe4, 0x65, 0xb4 } }
 
 class nsDOMMutationObserver final : public nsISupports,
-                                        public nsWrapperCache
+                                    public nsWrapperCache
 {
 public:
   nsDOMMutationObserver(already_AddRefed<nsPIDOMWindow>&& aOwner,
                         mozilla::dom::MutationCallback& aCb)
   : mOwner(aOwner), mLastPendingMutation(nullptr), mPendingMutationCount(0),
     mCallback(&aCb), mWaitingForRun(false), mId(++sCount)
   {
   }
--- a/dom/base/nsDOMScriptObjectFactory.h
+++ b/dom/base/nsDOMScriptObjectFactory.h
@@ -18,17 +18,17 @@
  *                               use in OS2
  */
 
 #include "nsIDOMScriptObjectFactory.h"
 #include "nsIObserver.h"
 #include "mozilla/Attributes.h"
 
 class nsDOMScriptObjectFactory final : public nsIDOMScriptObjectFactory,
-                                           public nsIObserver
+                                       public nsIObserver
 {
   ~nsDOMScriptObjectFactory() {}
 
 public:
   nsDOMScriptObjectFactory();
 
   NS_DECL_ISUPPORTS
 
--- a/dom/base/nsDOMSerializer.h
+++ b/dom/base/nsDOMSerializer.h
@@ -10,17 +10,17 @@
 #include "nsWrapperCache.h"
 #include "mozilla/ErrorResult.h"
 #include "mozilla/dom/XMLSerializerBinding.h"
 #include "nsAutoPtr.h"
 
 class nsINode;
 
 class nsDOMSerializer final : public nsIDOMSerializer,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
   nsDOMSerializer();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsDOMSerializer)
 
   // nsIDOMSerializer
--- a/dom/base/nsDOMWindowUtils.h
+++ b/dom/base/nsDOMWindowUtils.h
@@ -50,17 +50,17 @@ private:
   ~nsTranslationNodeList() {}
 
   nsTArray<nsCOMPtr<nsIDOMNode> > mNodes;
   nsTArray<bool> mNodeIsRoot;
   uint32_t mLength;
 };
 
 class nsDOMWindowUtils final : public nsIDOMWindowUtils,
-                                   public nsSupportsWeakReference
+                               public nsSupportsWeakReference
 {
   typedef mozilla::widget::TextEventDispatcher
     TextEventDispatcher;
 public:
   explicit nsDOMWindowUtils(nsGlobalWindow *aWindow);
   NS_DECL_ISUPPORTS
   NS_DECL_NSIDOMWINDOWUTILS
 
--- a/dom/base/nsDocument.h
+++ b/dom/base/nsDocument.h
@@ -592,18 +592,18 @@ protected:
 
     // Use shims for interfaces that docshell implements directly so that we
     // don't hand out references to the docshell.  The shims should all allow
     // getInterface back on us, but other than that each one should only
     // implement one interface.
     
     // XXXbz I wish we could just derive the _allcaps thing from _i
 #define DECL_SHIM(_i, _allcaps)                                              \
-    class _i##Shim final : public nsIInterfaceRequestor,                 \
-                               public _i                                     \
+    class _i##Shim final : public nsIInterfaceRequestor,                     \
+                           public _i                                         \
     {                                                                        \
       ~_i##Shim() {}                                                         \
     public:                                                                  \
       _i##Shim(nsIInterfaceRequestor* aIfreq, _i* aRealPtr)                  \
         : mIfReq(aIfreq), mRealPtr(aRealPtr)                                 \
       {                                                                      \
         NS_ASSERTION(mIfReq, "Expected non-null here");                      \
         NS_ASSERTION(mRealPtr, "Expected non-null here");                    \
--- a/dom/base/nsFocusManager.h
+++ b/dom/base/nsFocusManager.h
@@ -27,18 +27,18 @@ class nsIMessageBroadcaster;
 struct nsDelayedBlurOrFocusEvent;
 
 /**
  * The focus manager keeps track of where the focus is, that is, the node
  * which receives key events.
  */
 
 class nsFocusManager final : public nsIFocusManager,
-                                 public nsIObserver,
-                                 public nsSupportsWeakReference
+                             public nsIObserver,
+                             public nsSupportsWeakReference
 {
   typedef mozilla::widget::InputContextAction InputContextAction;
 
 public:
 
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsFocusManager, nsIFocusManager)
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIOBSERVER
--- a/dom/base/nsFormData.h
+++ b/dom/base/nsFormData.h
@@ -21,19 +21,19 @@ class ErrorResult;
 namespace dom {
 class File;
 class HTMLFormElement;
 class GlobalObject;
 } // namespace dom
 } // namespace mozilla
 
 class nsFormData final : public nsIDOMFormData,
-                             public nsIXHRSendable,
-                             public nsFormSubmission,
-                             public nsWrapperCache
+                         public nsIXHRSendable,
+                         public nsFormSubmission,
+                         public nsWrapperCache
 {
 private:
   ~nsFormData() {}
 
   typedef mozilla::dom::File File;
   struct FormDataTuple
   {
     nsString name;
--- a/dom/base/nsFrameLoader.h
+++ b/dom/base/nsFrameLoader.h
@@ -50,18 +50,18 @@ class RenderFrameParent;
 #if defined(MOZ_WIDGET_GTK)
 typedef struct _GtkWidget GtkWidget;
 #endif
 #ifdef MOZ_WIDGET_QT
 class QX11EmbedContainer;
 #endif
 
 class nsFrameLoader final : public nsIFrameLoader,
-                                public nsStubMutationObserver,
-                                public mozilla::dom::ipc::MessageManagerCallback
+                            public nsStubMutationObserver,
+                            public mozilla::dom::ipc::MessageManagerCallback
 {
   friend class AutoResetInShow;
   typedef mozilla::dom::PBrowserParent PBrowserParent;
   typedef mozilla::dom::TabParent TabParent;
   typedef mozilla::layout::RenderFrameParent RenderFrameParent;
 
 protected:
   nsFrameLoader(mozilla::dom::Element* aOwner, bool aNetworkCreated);
--- a/dom/base/nsFrameMessageManager.h
+++ b/dom/base/nsFrameMessageManager.h
@@ -148,20 +148,20 @@ public:
   virtual bool ToObject(JSContext* aCx, JS::MutableHandle<JSObject*> aObjp)
     override;
 
 private:
   JS::Rooted<JSObject*> mObj;
 };
 
 class nsFrameMessageManager final : public nsIContentFrameMessageManager,
-                                        public nsIMessageBroadcaster,
-                                        public nsIFrameScriptLoader,
-                                        public nsIProcessScriptLoader,
-                                        public nsIProcessChecker
+                                    public nsIMessageBroadcaster,
+                                    public nsIFrameScriptLoader,
+                                    public nsIProcessScriptLoader,
+                                    public nsIProcessChecker
 {
   friend class mozilla::dom::MessageManagerReporter;
   typedef mozilla::dom::StructuredCloneData StructuredCloneData;
 public:
   nsFrameMessageManager(mozilla::dom::ipc::MessageManagerCallback* aCallback,
                         nsFrameMessageManager* aParentManager,
                         /* mozilla::dom::ipc::MessageManagerFlags */ uint32_t aFlags)
   : mChrome(!!(aFlags & mozilla::dom::ipc::MM_CHROME)),
--- a/dom/base/nsGenConImageContent.cpp
+++ b/dom/base/nsGenConImageContent.cpp
@@ -16,17 +16,17 @@
 #include "imgIRequest.h"
 #include "mozilla/BasicEvents.h"
 #include "mozilla/EventDispatcher.h"
 #include "mozilla/EventStates.h"
 
 using namespace mozilla;
 
 class nsGenConImageContent final : public nsXMLElement,
-                                       public nsImageLoadingContent
+                                   public nsImageLoadingContent
 {
 public:
   explicit nsGenConImageContent(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsXMLElement(aNodeInfo)
   {
     // nsImageLoadingContent starts out broken, so we start out
     // suppressed to match it.
     AddStatesSilently(NS_EVENT_STATE_SUPPRESSED);
--- a/dom/base/nsGlobalWindow.cpp
+++ b/dom/base/nsGlobalWindow.cpp
@@ -472,17 +472,17 @@ static const char sPopStatePrefStr[] = "
 #define NETWORK_UPLOAD_EVENT_NAME     NS_LITERAL_STRING("moznetworkupload")
 #define NETWORK_DOWNLOAD_EVENT_NAME   NS_LITERAL_STRING("moznetworkdownload")
 
 /**
  * An indirect observer object that means we don't have to implement nsIObserver
  * on nsGlobalWindow, where any script could see it.
  */
 class nsGlobalWindowObserver final : public nsIObserver,
-                                         public nsIInterfaceRequestor
+                                     public nsIInterfaceRequestor
 {
 public:
   explicit nsGlobalWindowObserver(nsGlobalWindow* aWindow) : mWindow(aWindow) {}
   NS_DECL_ISUPPORTS
   NS_IMETHOD Observe(nsISupports* aSubject, const char* aTopic, const char16_t* aData) override
   {
     if (!mWindow)
       return NS_OK;
--- a/dom/base/nsLocation.h
+++ b/dom/base/nsLocation.h
@@ -21,18 +21,18 @@ class nsIURI;
 class nsIDocShell;
 class nsIDocShellLoadInfo;
 
 //*****************************************************************************
 // nsLocation: Script "location" object
 //*****************************************************************************
 
 class nsLocation final : public nsIDOMLocation
-                           , public nsWrapperCache
-                           , public mozilla::dom::URLSearchParamsObserver
+                       , public nsWrapperCache
+                       , public mozilla::dom::URLSearchParamsObserver
 {
   typedef mozilla::ErrorResult ErrorResult;
 
 public:
   nsLocation(nsPIDOMWindow* aWindow, nsIDocShell *aDocShell);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsLocation,
--- a/dom/base/nsMimeTypeArray.h
+++ b/dom/base/nsMimeTypeArray.h
@@ -12,17 +12,17 @@
 #include "nsWrapperCache.h"
 #include "nsAutoPtr.h"
 #include "nsPIDOMWindow.h"
 
 class nsMimeType;
 class nsPluginElement;
 
 class nsMimeTypeArray final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
   explicit nsMimeTypeArray(nsPIDOMWindow* aWindow);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsMimeTypeArray)
 
   nsPIDOMWindow* GetParentObject() const;
--- a/dom/base/nsObjectLoadingContent.cpp
+++ b/dom/base/nsObjectLoadingContent.cpp
@@ -1288,18 +1288,18 @@ nsObjectLoadingContent::GetBaseURI(nsIUR
   return NS_OK;
 }
 
 // nsIInterfaceRequestor
 // We use a shim class to implement this so that JS consumers still
 // see an interface requestor even though WebIDL bindings don't expose
 // that stuff.
 class ObjectInterfaceRequestorShim final : public nsIInterfaceRequestor,
-                                               public nsIChannelEventSink,
-                                               public nsIStreamListener
+                                           public nsIChannelEventSink,
+                                           public nsIStreamListener
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(ObjectInterfaceRequestorShim,
                                            nsIInterfaceRequestor)
   NS_DECL_NSIINTERFACEREQUESTOR
   // nsRefPtr<nsObjectLoadingContent> fails due to ambiguous AddRef/Release,
   // hence the ugly static cast :(
--- a/dom/base/nsPluginArray.h
+++ b/dom/base/nsPluginArray.h
@@ -13,18 +13,18 @@
 #include "nsWrapperCache.h"
 #include "nsPluginTags.h"
 #include "nsPIDOMWindow.h"
 
 class nsPluginElement;
 class nsMimeType;
 
 class nsPluginArray final : public nsIObserver,
-                                public nsSupportsWeakReference,
-                                public nsWrapperCache
+                            public nsSupportsWeakReference,
+                            public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(nsPluginArray,
                                                          nsIObserver)
 
   // nsIObserver
   NS_DECL_NSIOBSERVER
@@ -71,17 +71,17 @@ private:
 
   // mHiddenPlugins contains plugins that can be queried by
   // navigator.plugins["Hidden Plugin Name"] but do not need to be exposed in
   // navigator.plugins enumeration.
   nsTArray<nsRefPtr<nsPluginElement> > mHiddenPlugins;
 };
 
 class nsPluginElement final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(nsPluginElement)
 
   nsPluginElement(nsPIDOMWindow* aWindow, nsPluginTag* aPluginTag);
 
   nsPIDOMWindow* GetParentObject() const;
--- a/dom/base/nsRange.h
+++ b/dom/base/nsRange.h
@@ -26,18 +26,18 @@ class ErrorResult;
 namespace dom {
 class DocumentFragment;
 class DOMRect;
 class DOMRectList;
 }
 }
 
 class nsRange final : public nsIDOMRange,
-                          public nsStubMutationObserver,
-                          public nsWrapperCache
+                      public nsStubMutationObserver,
+                      public nsWrapperCache
 {
   typedef mozilla::ErrorResult ErrorResult;
   typedef mozilla::dom::DOMRect DOMRect;
   typedef mozilla::dom::DOMRectList DOMRectList;
 
   virtual ~nsRange();
 
 public:
--- a/dom/base/nsTextNode.cpp
+++ b/dom/base/nsTextNode.cpp
@@ -23,17 +23,17 @@
 
 using namespace mozilla;
 using namespace mozilla::dom;
 
 /**
  * class used to implement attr() generated content
  */
 class nsAttributeTextNode final : public nsTextNode,
-                                      public nsStubMutationObserver
+                                  public nsStubMutationObserver
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   
   nsAttributeTextNode(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                       int32_t aNameSpaceID,
                       nsIAtom* aAttrName) :
     nsTextNode(aNodeInfo),
--- a/dom/base/nsWindowMemoryReporter.h
+++ b/dom/base/nsWindowMemoryReporter.h
@@ -135,18 +135,18 @@ public:
  *   its own sub-tree, even if multiple tabs are showing the same URI.
  *
  * - <top-uri> is the URI of the top window.  Excepting special windows (such
  *   as browser.xul or hiddenWindow.html) it's what the address bar shows for
  *   the tab.
  *
  */
 class nsWindowMemoryReporter final : public nsIMemoryReporter,
-                                         public nsIObserver,
-                                         public nsSupportsWeakReference
+                                     public nsIObserver,
+                                     public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIMEMORYREPORTER
   NS_DECL_NSIOBSERVER
 
   static void Init();
 
--- a/dom/base/nsXMLHttpRequest.h
+++ b/dom/base/nsXMLHttpRequest.h
@@ -142,17 +142,17 @@ public:
   IMPL_EVENT_HANDLER(load)
   IMPL_EVENT_HANDLER(timeout)
   IMPL_EVENT_HANDLER(loadend)
   
   virtual void DisconnectFromOwner() override;
 };
 
 class nsXMLHttpRequestUpload final : public nsXHREventTarget,
-                                         public nsIXMLHttpRequestUpload
+                                     public nsIXMLHttpRequestUpload
 {
 public:
   explicit nsXMLHttpRequestUpload(mozilla::DOMEventTargetHelper* aOwner)
     : nsXHREventTarget(aOwner)
   {
   }
 
   NS_DECL_ISUPPORTS_INHERITED
@@ -175,25 +175,25 @@ private:
   virtual ~nsXMLHttpRequestUpload() {}
 };
 
 class nsXMLHttpRequestXPCOMifier;
 
 // Make sure that any non-DOM interfaces added here are also added to
 // nsXMLHttpRequestXPCOMifier.
 class nsXMLHttpRequest final : public nsXHREventTarget,
-                                   public nsIXMLHttpRequest,
-                                   public nsIJSXMLHttpRequest,
-                                   public nsIStreamListener,
-                                   public nsIChannelEventSink,
-                                   public nsIProgressEventSink,
-                                   public nsIInterfaceRequestor,
-                                   public nsSupportsWeakReference,
-                                   public nsITimerCallback,
-                                   public nsISizeOfEventTarget
+                               public nsIXMLHttpRequest,
+                               public nsIJSXMLHttpRequest,
+                               public nsIStreamListener,
+                               public nsIChannelEventSink,
+                               public nsIProgressEventSink,
+                               public nsIInterfaceRequestor,
+                               public nsSupportsWeakReference,
+                               public nsITimerCallback,
+                               public nsISizeOfEventTarget
 {
   friend class nsXHRParseEndListener;
   friend class nsXMLHttpRequestXPCOMifier;
 
 public:
   nsXMLHttpRequest();
 
   virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) override
@@ -629,17 +629,18 @@ protected:
   nsCOMPtr<nsIChannel> mChannel;
   nsCOMPtr<nsIDocument> mResponseXML;
   nsCOMPtr<nsIChannel> mCORSPreflightChannel;
   nsTArray<nsCString> mCORSUnsafeHeaders;
 
   nsCOMPtr<nsIStreamListener> mXMLParserStreamListener;
 
   // used to implement getAllResponseHeaders()
-  class nsHeaderVisitor : public nsIHttpHeaderVisitor {
+  class nsHeaderVisitor : public nsIHttpHeaderVisitor
+  {
   public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIHTTPHEADERVISITOR
     nsHeaderVisitor(nsXMLHttpRequest* aXMLHttpRequest, nsIHttpChannel* aHttpChannel)
       : mXHR(aXMLHttpRequest), mHttpChannel(aHttpChannel) {}
     const nsACString &Headers() { return mHeaders; }
   private:
     virtual ~nsHeaderVisitor() {}
@@ -815,20 +816,20 @@ public:
 
 private:
   bool mOldVal;
 };
 
 // A shim class designed to expose the non-DOM interfaces of
 // XMLHttpRequest via XPCOM stuff.
 class nsXMLHttpRequestXPCOMifier final : public nsIStreamListener,
-                                             public nsIChannelEventSink,
-                                             public nsIProgressEventSink,
-                                             public nsIInterfaceRequestor,
-                                             public nsITimerCallback
+                                         public nsIChannelEventSink,
+                                         public nsIProgressEventSink,
+                                         public nsIInterfaceRequestor,
+                                         public nsITimerCallback
 {
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXMLHttpRequestXPCOMifier,
                                            nsIStreamListener)
 
   explicit nsXMLHttpRequestXPCOMifier(nsXMLHttpRequest* aXHR) :
     mXHR(aXHR)
   {
--- a/dom/bluetooth/BluetoothProfileManagerBase.h
+++ b/dom/bluetooth/BluetoothProfileManagerBase.h
@@ -84,27 +84,27 @@ public:
   virtual void Reset() = 0;
 
   /**
    * Returns string of profile name.
    */
   virtual void GetName(nsACString& aName) = 0;
 };
 
-#define BT_DECL_PROFILE_MGR_BASE                                                 \
-public:                                                                          \
-  NS_DECL_ISUPPORTS                                                              \
-  NS_DECL_NSIOBSERVER                                                            \
-  virtual void OnGetServiceChannel(const nsAString& aDeviceAddress,              \
-                                   const nsAString& aServiceUuid,                \
+#define BT_DECL_PROFILE_MGR_BASE                                             \
+public:                                                                      \
+  NS_DECL_ISUPPORTS                                                          \
+  NS_DECL_NSIOBSERVER                                                        \
+  virtual void OnGetServiceChannel(const nsAString& aDeviceAddress,          \
+                                   const nsAString& aServiceUuid,            \
                                    int aChannel) override;                   \
   virtual void OnUpdateSdpRecords(const nsAString& aDeviceAddress) override; \
   virtual void GetAddress(nsAString& aDeviceAddress) override;               \
   virtual bool IsConnected() override;                                       \
-  virtual void Connect(const nsAString& aDeviceAddress,                          \
+  virtual void Connect(const nsAString& aDeviceAddress,                      \
                        BluetoothProfileController* aController) override;    \
   virtual void Disconnect(BluetoothProfileController* aController) override; \
   virtual void OnConnect(const nsAString& aErrorStr) override;               \
   virtual void OnDisconnect(const nsAString& AErrorStr) override;            \
   virtual void Reset() override;
 
 END_BLUETOOTH_NAMESPACE
 
--- a/dom/bluetooth2/BluetoothProfileManagerBase.h
+++ b/dom/bluetooth2/BluetoothProfileManagerBase.h
@@ -83,27 +83,27 @@ public:
   virtual void Reset() = 0;
 
   /**
    * Returns string of profile name.
    */
   virtual void GetName(nsACString& aName) = 0;
 };
 
-#define BT_DECL_PROFILE_MGR_BASE                                                 \
-public:                                                                          \
-  NS_DECL_ISUPPORTS                                                              \
-  NS_DECL_NSIOBSERVER                                                            \
-  virtual void OnGetServiceChannel(const nsAString& aDeviceAddress,              \
-                                   const nsAString& aServiceUuid,                \
+#define BT_DECL_PROFILE_MGR_BASE                                             \
+public:                                                                      \
+  NS_DECL_ISUPPORTS                                                          \
+  NS_DECL_NSIOBSERVER                                                        \
+  virtual void OnGetServiceChannel(const nsAString& aDeviceAddress,          \
+                                   const nsAString& aServiceUuid,            \
                                    int aChannel) override;                   \
   virtual void OnUpdateSdpRecords(const nsAString& aDeviceAddress) override; \
   virtual void GetAddress(nsAString& aDeviceAddress) override;               \
   virtual bool IsConnected() override;                                       \
-  virtual void Connect(const nsAString& aDeviceAddress,                          \
+  virtual void Connect(const nsAString& aDeviceAddress,                      \
                        BluetoothProfileController* aController) override;    \
   virtual void Disconnect(BluetoothProfileController* aController) override; \
   virtual void OnConnect(const nsAString& aErrorStr) override;               \
   virtual void OnDisconnect(const nsAString& AErrorStr) override;            \
   virtual void Reset() override;
 
 END_BLUETOOTH_NAMESPACE
 
--- a/dom/camera/DOMCameraCapabilities.h
+++ b/dom/camera/DOMCameraCapabilities.h
@@ -25,17 +25,17 @@ struct JSContext;
 
 namespace mozilla {
 namespace dom {
 
 /**
  * CameraRecorderVideoProfile
  */
 class CameraRecorderVideoProfile final : public nsISupports
-                                           , public nsWrapperCache
+                                       , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CameraRecorderVideoProfile)
 
   explicit CameraRecorderVideoProfile(nsISupports* aParent,
     const ICameraControl::RecorderProfile::Video& aProfile);
   nsISupports* GetParentObject() const        { return mParent; }
@@ -64,17 +64,17 @@ protected:
 private:
   DISALLOW_EVIL_CONSTRUCTORS(CameraRecorderVideoProfile);
 };
 
 /**
  * CameraRecorderAudioProfile
  */
 class CameraRecorderAudioProfile final : public nsISupports
-                                           , public nsWrapperCache
+                                       , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CameraRecorderAudioProfile)
 
   explicit CameraRecorderAudioProfile(nsISupports* aParent,
     const ICameraControl::RecorderProfile::Audio& aProfile);
   nsISupports* GetParentObject() const    { return mParent; }
@@ -98,17 +98,17 @@ protected:
 private:
   DISALLOW_EVIL_CONSTRUCTORS(CameraRecorderAudioProfile);
 };
 
 /**
  * CameraRecorderProfile
  */
 class CameraRecorderProfile final : public nsISupports
-                                      , public nsWrapperCache
+                                  , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CameraRecorderProfile)
 
   explicit CameraRecorderProfile(nsISupports* aParent,
                                  const ICameraControl::RecorderProfile& aProfile);
   nsISupports* GetParentObject() const          { return mParent; }
@@ -144,17 +144,17 @@ private:
 };
 
 /**
  * CameraRecorderProfiles
  */
 template<class T> class CameraClosedListenerProxy;
 
 class CameraRecorderProfiles final : public nsISupports
-                                       , public nsWrapperCache
+                                   , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CameraRecorderProfiles)
 
   explicit CameraRecorderProfiles(nsISupports* aParent,
                                   ICameraControl* aCameraControl);
   nsISupports* GetParentObject() const { return mParent; }
@@ -177,17 +177,17 @@ protected:
 private:
   DISALLOW_EVIL_CONSTRUCTORS(CameraRecorderProfiles);
 };
 
 /**
  * CameraCapabilities
  */
 class CameraCapabilities final : public nsISupports
-                                   , public nsWrapperCache
+                               , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CameraCapabilities)
 
   // Because this header's filename doesn't match its C++ or DOM-facing
   // classname, we can't rely on the [Func="..."] WebIDL tag to implicitly
   // include the right header for us; instead we must explicitly include a
--- a/dom/camera/DOMCameraControl.h
+++ b/dom/camera/DOMCameraControl.h
@@ -41,17 +41,17 @@ class ErrorResult;
 class StartRecordingHelper;
 
 #define NS_DOM_CAMERA_CONTROL_CID \
 { 0x3700c096, 0xf920, 0x438d, \
   { 0x8b, 0x3f, 0x15, 0xb3, 0xc9, 0x96, 0x23, 0x62 } }
 
 // Main camera control.
 class nsDOMCameraControl final : public DOMMediaStream
-                                   , public nsSupportsWeakReference
+                               , public nsSupportsWeakReference
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_DOM_CAMERA_CONTROL_CID)
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(nsDOMCameraControl, DOMMediaStream)
   NS_DECL_ISUPPORTS_INHERITED
 
   // Because this header's filename doesn't match its C++ or DOM-facing
--- a/dom/camera/DOMCameraDetectedFace.h
+++ b/dom/camera/DOMCameraDetectedFace.h
@@ -12,17 +12,17 @@
 #include "mozilla/dom/DOMPoint.h"
 #include "ICameraControl.h"
 
 namespace mozilla {
 
 namespace dom {
 
 class DOMCameraDetectedFace final : public nsISupports
-                                      , public nsWrapperCache
+                                  , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMCameraDetectedFace)
 
   // Because this header's filename doesn't match its C++ or DOM-facing
   // classname, we can't rely on the [Func="..."] WebIDL tag to implicitly
   // include the right header for us; instead we must explicitly include a
--- a/dom/cellbroadcast/CellBroadcastMessage.h
+++ b/dom/cellbroadcast/CellBroadcastMessage.h
@@ -15,17 +15,17 @@
 class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 
 class CellBroadcastEtwsInfo;
 
 class CellBroadcastMessage final : public nsISupports
-                                     , public nsWrapperCache
+                                 , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CellBroadcastMessage)
 
   CellBroadcastMessage(nsPIDOMWindow* aWindow,
                        uint32_t aServiceId,
                        uint32_t aGsmGeographicalScope,
@@ -87,17 +87,17 @@ private:
   nsString mBody;
   Nullable<CellBroadcastMessageClass> mMessageClass;
   uint64_t mTimestamp;
   Nullable<uint16_t> mCdmaServiceCategory;
   nsRefPtr<CellBroadcastEtwsInfo> mEtwsInfo;
 };
 
 class CellBroadcastEtwsInfo final : public nsISupports
-                                      , public nsWrapperCache
+                                  , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CellBroadcastEtwsInfo)
 
   CellBroadcastEtwsInfo(nsPIDOMWindow* aWindow,
                         uint32_t aWarningType,
                         bool aEmergencyUserAlert,
--- a/dom/cellbroadcast/ipc/CellBroadcastIPCService.h
+++ b/dom/cellbroadcast/ipc/CellBroadcastIPCService.h
@@ -11,17 +11,17 @@
 #include "nsCOMPtr.h"
 #include "nsTArray.h"
 
 namespace mozilla {
 namespace dom {
 namespace cellbroadcast {
 
 class CellBroadcastIPCService final : public PCellBroadcastChild
-                                        , public nsICellBroadcastService
+                                    , public nsICellBroadcastService
 
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSICELLBROADCASTSERVICE
 
   CellBroadcastIPCService();
 
@@ -50,9 +50,9 @@ private:
   bool mActorDestroyed;
   nsTArray<nsCOMPtr<nsICellBroadcastListener>> mListeners;
 };
 
 } // namespace cellbroadcast
 } // namespace dom
 } // namespace mozilla
 
-#endif // mozilla_dom_cellbroadcast_CellBroadcastIPCService_h
\ No newline at end of file
+#endif // mozilla_dom_cellbroadcast_CellBroadcastIPCService_h
--- a/dom/cellbroadcast/ipc/CellBroadcastParent.h
+++ b/dom/cellbroadcast/ipc/CellBroadcastParent.h
@@ -11,17 +11,17 @@
 #include "mozilla/dom/cellbroadcast/PCellBroadcastParent.h"
 #include "nsICellBroadcastService.h"
 
 namespace mozilla {
 namespace dom {
 namespace cellbroadcast {
 
 class CellBroadcastParent final : public PCellBroadcastParent
-                                    , public nsICellBroadcastListener
+                                , public nsICellBroadcastListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSICELLBROADCASTLISTENER
 
   bool Init();
 
 private:
--- a/dom/crypto/CryptoKey.h
+++ b/dom/crypto/CryptoKey.h
@@ -54,18 +54,18 @@ Thus, internally, a key has the followin
 * KeyAlgorithm - the algorithm (which must serialize/deserialize itself)
 * The actual keys (which the CryptoKey must serialize)
 
 */
 
 struct JsonWebKey;
 
 class CryptoKey final : public nsISupports,
-                            public nsWrapperCache,
-                            public nsNSSShutDownObject
+                        public nsWrapperCache,
+                        public nsNSSShutDownObject
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CryptoKey)
 
   static const uint32_t CLEAR_EXTRACTABLE = 0xFFFFFFE;
   static const uint32_t EXTRACTABLE = 0x00000001;
 
--- a/dom/datastore/DataStoreService.h
+++ b/dom/datastore/DataStoreService.h
@@ -23,17 +23,17 @@ namespace dom {
 class DataStoreInfo;
 class FirstRevisionIdCallback;
 class PendingRequest;
 class Promise;
 class RetrieveRevisionsCounter;
 class RevisionAddedEnableStoreCallback;
 
 class DataStoreService final : public nsIDataStoreService
-                                 , public nsIObserver
+                             , public nsIObserver
 {
   friend class ContentChild;
   friend class FirstRevisionIdCallback;
   friend class RetrieveRevisionsCounter;
   friend class RevisionAddedEnableStoreCallback;
 
 public:
   NS_DECL_ISUPPORTS
--- a/dom/events/CustomEvent.h
+++ b/dom/events/CustomEvent.h
@@ -9,17 +9,17 @@
 #include "nsIDOMCustomEvent.h"
 
 namespace mozilla {
 namespace dom {
 
 struct CustomEventInit;
 
 class CustomEvent final : public Event,
-                              public nsIDOMCustomEvent
+                          public nsIDOMCustomEvent
 {
 private:
   virtual ~CustomEvent();
 
   nsCOMPtr<nsIVariant> mDetail;
 
 public:
   explicit CustomEvent(mozilla::dom::EventTarget* aOwner,
--- a/dom/events/DOMEventTargetHelper.h
+++ b/dom/events/DOMEventTargetHelper.h
@@ -276,17 +276,17 @@ NS_DEFINE_STATIC_IID_ACCESSOR(DOMEventTa
     return _to GetJSContextForEventHandlers(); \
   }
 
 #define NS_REALLY_FORWARD_NSIDOMEVENTTARGET(_class) \
   using _class::AddEventListener;                   \
   using _class::RemoveEventListener;                \
   NS_FORWARD_NSIDOMEVENTTARGET(_class::)            \
   virtual mozilla::EventListenerManager*            \
-  GetOrCreateListenerManager() override {       \
+  GetOrCreateListenerManager() override {           \
     return _class::GetOrCreateListenerManager();    \
   }                                                 \
   virtual mozilla::EventListenerManager*            \
-  GetExistingListenerManager() const override { \
+  GetExistingListenerManager() const override {     \
     return _class::GetExistingListenerManager();    \
   }
 
 #endif // mozilla_DOMEventTargetHelper_h_
--- a/dom/events/DataTransfer.h
+++ b/dom/events/DataTransfer.h
@@ -47,17 +47,17 @@ struct TransferItem {
   nsCOMPtr<nsIVariant> mData;
 };
 
 #define NS_DATATRANSFER_IID \
 { 0x43ee0327, 0xde5d, 0x463d, \
   { 0x9b, 0xd0, 0xf1, 0x79, 0x09, 0x69, 0xf2, 0xfb } }
 
 class DataTransfer final : public nsIDOMDataTransfer,
-                               public nsWrapperCache
+                           public nsWrapperCache
 {
 public:
   NS_DECLARE_STATIC_IID_ACCESSOR(NS_DATATRANSFER_IID)
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIDOMDATATRANSFER
 
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DataTransfer)
--- a/dom/events/IMEContentObserver.h
+++ b/dom/events/IMEContentObserver.h
@@ -27,21 +27,21 @@ class nsPresContext;
 
 namespace mozilla {
 
 class EventStateManager;
 
 // IMEContentObserver notifies widget of any text and selection changes
 // in the currently focused editor
 class IMEContentObserver final : public nsISelectionListener
-                                   , public nsStubMutationObserver
-                                   , public nsIReflowObserver
-                                   , public nsIScrollObserver
-                                   , public nsSupportsWeakReference
-                                   , public nsIEditorObserver
+                               , public nsStubMutationObserver
+                               , public nsIReflowObserver
+                               , public nsIScrollObserver
+                               , public nsSupportsWeakReference
+                               , public nsIEditorObserver
 {
   friend class AsyncMergeableNotificationsFlusher;
 
 public:
   IMEContentObserver();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(IMEContentObserver,
--- a/dom/events/ImageCaptureError.h
+++ b/dom/events/ImageCaptureError.h
@@ -16,17 +16,17 @@ namespace mozilla {
 namespace dom {
 
 /**
  * This is the implementation of ImageCaptureError on W3C specification
  * https://dvcs.w3.org/hg/dap/raw-file/default/media-stream-capture/ImageCapture.html#idl-def-ImageCaptureError.
  * This object should be generated by ImageCapture object only.
  */
 class ImageCaptureError final : public nsISupports,
-                                    public nsWrapperCache
+                                public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(ImageCaptureError)
 
   ImageCaptureError(nsISupports* aParent, uint16_t aCode, const nsAString& aMessage);
 
   nsISupports* GetParentObject() const;
--- a/dom/events/MessageEvent.h
+++ b/dom/events/MessageEvent.h
@@ -29,17 +29,17 @@ class ServiceWorkerClient;
 /**
  * Implements the MessageEvent event, used for cross-document messaging and
  * server-sent events.
  *
  * See http://www.whatwg.org/specs/web-apps/current-work/#messageevent for
  * further details.
  */
 class MessageEvent final : public Event,
-                               public nsIDOMMessageEvent
+                           public nsIDOMMessageEvent
 {
 public:
   MessageEvent(EventTarget* aOwner,
                nsPresContext* aPresContext,
                WidgetEvent* aEvent);
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_INHERITED(MessageEvent, Event)
--- a/dom/events/PaintRequest.h
+++ b/dom/events/PaintRequest.h
@@ -13,17 +13,17 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {
 
 class DOMRect;
 
 class PaintRequest final : public nsIDOMPaintRequest
-                             , public nsWrapperCache
+                         , public nsWrapperCache
 {
 public:
   explicit PaintRequest(nsIDOMEvent* aParent)
     : mParent(aParent)
   {
     mRequest.mFlags = 0;
   }
 
@@ -50,17 +50,17 @@ public:
 private:
   ~PaintRequest() {}
 
   nsCOMPtr<nsIDOMEvent> mParent;
   nsInvalidateRequestList::Request mRequest;
 };
 
 class PaintRequestList final : public nsISupports,
-                                   public nsWrapperCache
+                               public nsWrapperCache
 {
 public:
   explicit PaintRequestList(nsIDOMEvent *aParent) : mParent(aParent)
   {
   }
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(PaintRequestList)
--- a/dom/events/Touch.h
+++ b/dom/events/Touch.h
@@ -16,18 +16,18 @@
 class nsPresContext;
 
 namespace mozilla {
 namespace dom {
 
 class EventTarget;
 
 class Touch final : public nsISupports
-                      , public nsWrapperCache
-                      , public WidgetPointerHelper
+                  , public nsWrapperCache
+                  , public WidgetPointerHelper
 {
 public:
   static bool PrefEnabled(JSContext* aCx, JSObject* aGlobal);
 
   Touch(EventTarget* aTarget,
         int32_t aIdentifier,
         int32_t aPageX,
         int32_t aPageY,
--- a/dom/events/TouchEvent.h
+++ b/dom/events/TouchEvent.h
@@ -15,17 +15,17 @@
 #include "nsWrapperCache.h"
 
 class nsAString;
 
 namespace mozilla {
 namespace dom {
 
 class TouchList final : public nsISupports
-                          , public nsWrapperCache
+                      , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(TouchList)
 
   explicit TouchList(nsISupports* aParent)
     : mParent(aParent)
   {
--- a/dom/events/UIEvent.h
+++ b/dom/events/UIEvent.h
@@ -171,25 +171,25 @@ protected:
 };
 
 } // namespace dom
 } // namespace mozilla
 
 #define NS_FORWARD_TO_UIEVENT                               \
   NS_FORWARD_NSIDOMUIEVENT(UIEvent::)                       \
   NS_FORWARD_TO_EVENT_NO_SERIALIZATION_NO_DUPLICATION       \
-  NS_IMETHOD DuplicatePrivateData() override            \
+  NS_IMETHOD DuplicatePrivateData() override                \
   {                                                         \
     return UIEvent::DuplicatePrivateData();                 \
   }                                                         \
   NS_IMETHOD_(void) Serialize(IPC::Message* aMsg,           \
                               bool aSerializeInterfaceType) \
-    override                                            \
+    override                                                \
   {                                                         \
     UIEvent::Serialize(aMsg, aSerializeInterfaceType);      \
   }                                                         \
   NS_IMETHOD_(bool) Deserialize(const IPC::Message* aMsg,   \
-                                void** aIter) override  \
+                                void** aIter) override      \
   {                                                         \
     return UIEvent::Deserialize(aMsg, aIter);               \
   }
 
 #endif // mozilla_dom_UIEvent_h_
--- a/dom/fetch/Fetch.cpp
+++ b/dom/fetch/Fetch.cpp
@@ -40,17 +40,17 @@
 #include "Workers.h"
 
 namespace mozilla {
 namespace dom {
 
 using namespace workers;
 
 class WorkerFetchResolver final : public FetchDriverObserver,
-                                      public WorkerFeature
+                                  public WorkerFeature
 {
   friend class MainThreadFetchRunnable;
   friend class WorkerFetchResponseEndRunnable;
   friend class WorkerFetchResponseRunnable;
 
   workers::WorkerPrivate* mWorkerPrivate;
 
   Mutex mCleanUpLock;
--- a/dom/fetch/FetchDriver.h
+++ b/dom/fetch/FetchDriver.h
@@ -37,19 +37,19 @@ public:
   { };
 
 protected:
   virtual ~FetchDriverObserver()
   { };
 };
 
 class FetchDriver final : public nsIStreamListener,
-                              public nsIChannelEventSink,
-                              public nsIInterfaceRequestor,
-                              public nsIAsyncVerifyRedirectCallback
+                          public nsIChannelEventSink,
+                          public nsIInterfaceRequestor,
+                          public nsIAsyncVerifyRedirectCallback
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSICHANNELEVENTSINK
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSIASYNCVERIFYREDIRECTCALLBACK
--- a/dom/fetch/Headers.h
+++ b/dom/fetch/Headers.h
@@ -29,17 +29,17 @@ class OwningHeadersOrByteStringSequenceS
 /**
  * This Headers class is only used to represent the content facing Headers
  * object. It is actually backed by an InternalHeaders implementation. Gecko
  * code should NEVER use this, except in the Request and Response
  * implementations, where they must always be created from the backing
  * InternalHeaders object.
  */
 class Headers final : public nsISupports
-                        , public nsWrapperCache
+                    , public nsWrapperCache
 {
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Headers)
 
   friend class Request;
   friend class Response;
 
 private:
--- a/dom/fetch/Request.h
+++ b/dom/fetch/Request.h
@@ -22,18 +22,18 @@ namespace mozilla {
 namespace dom {
 
 class Headers;
 class InternalHeaders;
 class Promise;
 class RequestOrUSVString;
 
 class Request final : public nsISupports
-                        , public FetchBody<Request>
-                        , public nsWrapperCache
+                    , public FetchBody<Request>
+                    , public nsWrapperCache
 {
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Request)
 
 public:
   Request(nsIGlobalObject* aOwner, InternalRequest* aRequest);
 
   JSObject*
--- a/dom/fetch/Response.h
+++ b/dom/fetch/Response.h
@@ -20,18 +20,18 @@ namespace mozilla {
 namespace dom {
 
 class ArrayBufferOrArrayBufferViewOrUSVStringOrURLSearchParams;
 class Headers;
 class InternalHeaders;
 class Promise;
 
 class Response final : public nsISupports
-                         , public FetchBody<Response>
-                         , public nsWrapperCache
+                     , public FetchBody<Response>
+                     , public nsWrapperCache
 {
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Response)
 
 public:
   Response(nsIGlobalObject* aGlobal, InternalResponse* aInternalResponse);
 
   Response(const Response& aOther) = delete;
--- a/dom/fmradio/FMRadio.cpp
+++ b/dom/fmradio/FMRadio.cpp
@@ -28,17 +28,17 @@
 #define DOM_FM_ANTENNA_INTERNAL_PREF "dom.fmradio.antenna.internal"
 
 using namespace mozilla::hal;
 using mozilla::Preferences;
 
 BEGIN_FMRADIO_NAMESPACE
 
 class FMRadioRequest final : public FMRadioReplyRunnable
-                               , public DOMRequest
+                           , public DOMRequest
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   FMRadioRequest(nsPIDOMWindow* aWindow, FMRadio* aFMRadio)
     : DOMRequest(aWindow)
     , mType(FMRadioRequestArgs::T__None)
   {
--- a/dom/fmradio/FMRadio.h
+++ b/dom/fmradio/FMRadio.h
@@ -16,21 +16,21 @@
 class nsPIDOMWindow;
 class nsIScriptContext;
 
 BEGIN_FMRADIO_NAMESPACE
 
 class DOMRequest;
 
 class FMRadio final : public DOMEventTargetHelper
-                        , public hal::SwitchObserver
-                        , public FMRadioEventObserver
-                        , public nsSupportsWeakReference
-                        , public nsIAudioChannelAgentCallback
-                        , public nsIDOMEventListener
+                    , public hal::SwitchObserver
+                    , public FMRadioEventObserver
+                    , public nsSupportsWeakReference
+                    , public nsIAudioChannelAgentCallback
+                    , public nsIDOMEventListener
 
 {
   friend class FMRadioRequest;
 
 public:
   FMRadio();
 
   NS_DECL_ISUPPORTS_INHERITED
--- a/dom/fmradio/FMRadioService.h
+++ b/dom/fmradio/FMRadioService.h
@@ -143,19 +143,19 @@ enum FMRadioState
   Disabled,
   Disabling,
   Enabling,
   Enabled,
   Seeking
 };
 
 class FMRadioService final : public IFMRadioService
-                               , public hal::FMRadioObserver
-                               , public hal::FMRadioRDSObserver
-                               , public nsIObserver
+                           , public hal::FMRadioObserver
+                           , public hal::FMRadioRDSObserver
+                           , public nsIObserver
 {
   friend class ReadAirplaneModeSettingTask;
   friend class EnableRunnable;
   friend class DisableRunnable;
   friend class NotifyRunnable;
 
 public:
   static FMRadioService* Singleton();
--- a/dom/fmradio/ipc/FMRadioChild.h
+++ b/dom/fmradio/ipc/FMRadioChild.h
@@ -18,17 +18,17 @@ BEGIN_FMRADIO_NAMESPACE
  * FMRadioChild plays two roles:
  *   - Kind of proxy of FMRadioService
  *     Redirect all the requests  coming from web content to FMRadioService
  *     in parent through IPC channel.
  *   - Child Actor of PFMRadio
  *     IPC channel to transfer the requests.
  */
 class FMRadioChild final : public IFMRadioService
-                             , public PFMRadioChild
+                         , public PFMRadioChild
 {
 public:
   static FMRadioChild* Singleton();
   ~FMRadioChild();
 
   void SendRequest(FMRadioReplyRunnable* aReplyRunnable,
                    FMRadioRequestArgs aArgs);
 
--- a/dom/fmradio/ipc/FMRadioParent.h
+++ b/dom/fmradio/ipc/FMRadioParent.h
@@ -11,17 +11,17 @@
 #include "mozilla/dom/PFMRadioParent.h"
 #include "mozilla/HalTypes.h"
 
 BEGIN_FMRADIO_NAMESPACE
 
 class PFMRadioRequestParent;
 
 class FMRadioParent final : public PFMRadioParent
-                              , public FMRadioEventObserver
+                          , public FMRadioEventObserver
 {
 public:
   FMRadioParent();
   ~FMRadioParent();
 
   virtual void
   ActorDestroy(ActorDestroyReason aWhy) override;
 
--- a/dom/fmradio/ipc/FMRadioRequestParent.h
+++ b/dom/fmradio/ipc/FMRadioRequestParent.h
@@ -9,17 +9,17 @@
 
 #include "FMRadioCommon.h"
 #include "mozilla/dom/PFMRadioRequestParent.h"
 #include "FMRadioService.h"
 
 BEGIN_FMRADIO_NAMESPACE
 
 class FMRadioRequestParent final : public PFMRadioRequestParent
-                                     , public FMRadioReplyRunnable
+                                 , public FMRadioReplyRunnable
 {
 public:
   FMRadioRequestParent();
   ~FMRadioRequestParent();
 
   virtual void ActorDestroy(ActorDestroyReason aWhy) override;
 
   NS_IMETHOD Run();
--- a/dom/gamepad/Gamepad.h
+++ b/dom/gamepad/Gamepad.h
@@ -27,17 +27,17 @@ const int kButtonLeftTrigger = 6;
 const int kButtonRightTrigger = 7;
 
 const int kLeftStickXAxis = 0;
 const int kLeftStickYAxis = 1;
 const int kRightStickXAxis = 2;
 const int kRightStickYAxis = 3;
 
 class Gamepad final : public nsISupports,
-                          public nsWrapperCache
+                      public nsWrapperCache
 {
 public:
   Gamepad(nsISupports* aParent,
           const nsAString& aID, uint32_t aIndex,
           GamepadMappingType aMapping,
           uint32_t aNumButtons, uint32_t aNumAxes);
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Gamepad)
--- a/dom/geolocation/nsGeoPosition.h
+++ b/dom/geolocation/nsGeoPosition.h
@@ -72,17 +72,17 @@ private:
 ////////////////////////////////////////////////////
 
 namespace mozilla {
 namespace dom {
 
 class Coordinates;
 
 class Position final : public nsISupports,
-                           public nsWrapperCache
+                       public nsWrapperCache
 {
   ~Position();
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Position)
 
 public:
@@ -100,17 +100,17 @@ public:
 
 private:
   nsRefPtr<Coordinates> mCoordinates;
   nsCOMPtr<nsISupports> mParent;
   nsCOMPtr<nsIDOMGeoPosition> mGeoPosition;
 };
 
 class Coordinates final : public nsISupports,
-                              public nsWrapperCache
+                          public nsWrapperCache
 {
   ~Coordinates();
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(Coordinates)
 
 public:
--- a/dom/geolocation/nsGeolocation.h
+++ b/dom/geolocation/nsGeolocation.h
@@ -48,17 +48,18 @@ typedef CallbackObjectHolder<PositionErr
 struct CachedPositionAndAccuracy {
   nsCOMPtr<nsIDOMGeoPosition> position;
   bool isHighAccuracy;
 };
 
 /**
  * Singleton that manages the geolocation provider
  */
-class nsGeolocationService final : public nsIGeolocationUpdate, public nsIObserver
+class nsGeolocationService final : public nsIGeolocationUpdate,
+                                   public nsIObserver
 {
 public:
 
   static already_AddRefed<nsGeolocationService> GetGeolocationService();
   static mozilla::StaticRefPtr<nsGeolocationService> sService;
 
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIGEOLOCATIONUPDATE
@@ -119,18 +120,18 @@ private:
 
 namespace mozilla {
 namespace dom {
 
 /**
  * Can return a geolocation info
  */
 class Geolocation final : public nsIDOMGeoGeolocation,
-                              public nsIGeolocationUpdate,
-                              public nsWrapperCache
+                          public nsIGeolocationUpdate,
+                          public nsWrapperCache
 {
 public:
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS_AMBIGUOUS(Geolocation, nsIDOMGeoGeolocation)
 
   NS_DECL_NSIGEOLOCATIONUPDATE
   NS_DECL_NSIDOMGEOGEOLOCATION
@@ -216,17 +217,17 @@ private:
   // Pending requests are used when the service is not ready
   nsTArray<nsRefPtr<nsGeolocationRequest> > mPendingRequests;
 
   // Array containing already cleared watch IDs
   nsTArray<int32_t> mClearedWatchIDs;
 };
 
 class PositionError final : public nsIDOMGeoPositionError,
-                                public nsWrapperCache
+                            public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(PositionError)
 
   NS_DECL_NSIDOMGEOPOSITIONERROR
 
   PositionError(Geolocation* aParent, int16_t aCode);
--- a/dom/html/HTMLAllCollection.h
+++ b/dom/html/HTMLAllCollection.h
@@ -25,17 +25,17 @@ namespace mozilla {
 class ErrorResult;
 
 namespace dom {
 
 class OwningNodeOrHTMLCollection;
 template<typename> struct Nullable;
 
 class HTMLAllCollection final : public nsISupports
-                                  , public nsWrapperCache
+                              , public nsWrapperCache
 {
   ~HTMLAllCollection();
 
 public:
   explicit HTMLAllCollection(nsHTMLDocument* aDocument);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(HTMLAllCollection)
--- a/dom/html/HTMLAnchorElement.h
+++ b/dom/html/HTMLAnchorElement.h
@@ -14,18 +14,18 @@
 #include "nsDOMTokenList.h"
 
 namespace mozilla {
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 namespace dom {
 
 class HTMLAnchorElement final : public nsGenericHTMLElement,
-                                    public nsIDOMHTMLAnchorElement,
-                                    public Link
+                                public nsIDOMHTMLAnchorElement,
+                                public Link
 {
 public:
   using Element::GetText;
   using Element::SetText;
 
   explicit HTMLAnchorElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
     , Link(this)
--- a/dom/html/HTMLAreaElement.h
+++ b/dom/html/HTMLAreaElement.h
@@ -18,18 +18,18 @@
 class nsIDocument;
 
 namespace mozilla {
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 namespace dom {
 
 class HTMLAreaElement final : public nsGenericHTMLElement,
-                                  public nsIDOMHTMLAreaElement,
-                                  public Link
+                              public nsIDOMHTMLAreaElement,
+                              public Link
 {
 public:
   explicit HTMLAreaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // CC
--- a/dom/html/HTMLBRElement.h
+++ b/dom/html/HTMLBRElement.h
@@ -10,17 +10,17 @@
 #include "nsIDOMHTMLBRElement.h"
 #include "nsGenericHTMLElement.h"
 #include "nsGkAtoms.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLBRElement final : public nsGenericHTMLElement,
-                                public nsIDOMHTMLBRElement
+                            public nsIDOMHTMLBRElement
 {
 public:
   explicit HTMLBRElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMHTMLBRElement
--- a/dom/html/HTMLBodyElement.h
+++ b/dom/html/HTMLBodyElement.h
@@ -30,17 +30,17 @@ public:
 #ifdef DEBUG
   virtual void List(FILE* out = stdout, int32_t aIndent = 0) const override;
 #endif
 
   HTMLBodyElement*  mPart;  // not ref-counted, cleared by content 
 };
 
 class HTMLBodyElement final : public nsGenericHTMLElement,
-                                  public nsIDOMHTMLBodyElement
+                              public nsIDOMHTMLBodyElement
 {
 public:
   using Element::GetText;
   using Element::SetText;
 
   explicit HTMLBodyElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
--- a/dom/html/HTMLButtonElement.h
+++ b/dom/html/HTMLButtonElement.h
@@ -12,18 +12,18 @@
 #include "nsIConstraintValidation.h"
 
 namespace mozilla {
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 namespace dom {
 
 class HTMLButtonElement final : public nsGenericHTMLFormElementWithState,
-                                    public nsIDOMHTMLButtonElement,
-                                    public nsIConstraintValidation
+                                public nsIDOMHTMLButtonElement,
+                                public nsIConstraintValidation
 {
 public:
   using nsIConstraintValidation::GetValidationMessage;
 
   explicit HTMLButtonElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                              FromParser aFromParser = NOT_FROM_PARSER);
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(HTMLButtonElement,
--- a/dom/html/HTMLCanvasElement.h
+++ b/dom/html/HTMLCanvasElement.h
@@ -37,17 +37,17 @@ class PrintCallback;
 
 enum class CanvasContextType : uint8_t {
   Canvas2D,
   WebGL1,
   WebGL2
 };
 
 class HTMLCanvasElement final : public nsGenericHTMLElement,
-                                    public nsIDOMHTMLCanvasElement
+                                public nsIDOMHTMLCanvasElement
 {
   enum {
     DEFAULT_CANVAS_WIDTH = 300,
     DEFAULT_CANVAS_HEIGHT = 150
   };
 
   typedef layers::CanvasLayer CanvasLayer;
   typedef layers::LayerManager LayerManager;
--- a/dom/html/HTMLDivElement.h
+++ b/dom/html/HTMLDivElement.h
@@ -8,17 +8,17 @@
 #include "mozilla/Attributes.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLDivElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLDivElement final : public nsGenericHTMLElement,
-                                 public nsIDOMHTMLDivElement
+                             public nsIDOMHTMLDivElement
 {
 public:
   explicit HTMLDivElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
   }
 
   // nsISupports
--- a/dom/html/HTMLFieldSetElement.h
+++ b/dom/html/HTMLFieldSetElement.h
@@ -13,18 +13,18 @@
 #include "mozilla/dom/HTMLFormElement.h"
 #include "mozilla/dom/ValidityState.h"
 
 namespace mozilla {
 class EventChainPreVisitor;
 namespace dom {
 
 class HTMLFieldSetElement final : public nsGenericHTMLFormElement,
-                                      public nsIDOMHTMLFieldSetElement,
-                                      public nsIConstraintValidation
+                                  public nsIDOMHTMLFieldSetElement,
+                                  public nsIConstraintValidation
 {
 public:
   using nsGenericHTMLFormElement::GetForm;
   using nsIConstraintValidation::Validity;
   using nsIConstraintValidation::CheckValidity;
   using nsIConstraintValidation::GetValidationMessage;
 
   explicit HTMLFieldSetElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
--- a/dom/html/HTMLFormControlsCollection.h
+++ b/dom/html/HTMLFormControlsCollection.h
@@ -19,17 +19,17 @@ class nsIFormControl;
 namespace mozilla {
 namespace dom {
 class HTMLFormElement;
 class HTMLImageElement;
 class OwningRadioNodeListOrElement;
 template<typename> struct Nullable;
 
 class HTMLFormControlsCollection final : public nsIHTMLCollection
-                                           , public nsWrapperCache
+                                       , public nsWrapperCache
 {
 public:
   explicit HTMLFormControlsCollection(HTMLFormElement* aForm);
 
   void DropFormReference();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
 
--- a/dom/html/HTMLFormElement.h
+++ b/dom/html/HTMLFormElement.h
@@ -29,20 +29,20 @@ class nsIURI;
 namespace mozilla {
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 namespace dom {
 class HTMLFormControlsCollection;
 class HTMLImageElement;
 
 class HTMLFormElement final : public nsGenericHTMLElement,
-                                  public nsIDOMHTMLFormElement,
-                                  public nsIWebProgressListener,
-                                  public nsIForm,
-                                  public nsIRadioGroupContainer
+                              public nsIDOMHTMLFormElement,
+                              public nsIWebProgressListener,
+                              public nsIForm,
+                              public nsIRadioGroupContainer
 {
   friend class HTMLFormControlsCollection;
 
 public:
   explicit HTMLFormElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   enum {
     FORM_CONTROL_LIST_HASHTABLE_LENGTH = 8
--- a/dom/html/HTMLFrameElement.h
+++ b/dom/html/HTMLFrameElement.h
@@ -12,17 +12,17 @@
 #include "nsGkAtoms.h"
 
 class nsIDOMDocument;
 
 namespace mozilla {
 namespace dom {
 
 class HTMLFrameElement final : public nsGenericHTMLFrameElement,
-                                   public nsIDOMHTMLFrameElement
+                               public nsIDOMHTMLFrameElement
 {
 public:
   using nsGenericHTMLFrameElement::SwapFrameLoaders;
 
   explicit HTMLFrameElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                             FromParser aFromParser = NOT_FROM_PARSER);
 
   // nsISupports
--- a/dom/html/HTMLFrameSetElement.h
+++ b/dom/html/HTMLFrameSetElement.h
@@ -38,17 +38,17 @@ struct nsFramesetSpec {
 //----------------------------------------------------------------------
 
 namespace mozilla {
 namespace dom {
 
 class OnBeforeUnloadEventHandlerNonNull;
 
 class HTMLFrameSetElement final : public nsGenericHTMLElement,
-                                      public nsIDOMHTMLFrameSetElement
+                                  public nsIDOMHTMLFrameSetElement
 {
 public:
   explicit HTMLFrameSetElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo),
       mNumRows(0),
       mNumCols(0),
       mCurrentRowColHint(NS_STYLE_HINT_REFLOW)
   {
--- a/dom/html/HTMLHRElement.h
+++ b/dom/html/HTMLHRElement.h
@@ -12,17 +12,17 @@
 #include "nsMappedAttributes.h"
 #include "nsAttrValueInlines.h"
 #include "nsRuleData.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLHRElement final : public nsGenericHTMLElement,
-                                public nsIDOMHTMLHRElement
+                            public nsIDOMHTMLHRElement
 {
 public:
   explicit HTMLHRElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMHTMLHRElement
--- a/dom/html/HTMLHeadingElement.h
+++ b/dom/html/HTMLHeadingElement.h
@@ -9,17 +9,17 @@
 #include "mozilla/Attributes.h"
 #include "nsIDOMHTMLHeadingElement.h"
 #include "nsGenericHTMLElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLHeadingElement final : public nsGenericHTMLElement,
-				     public nsIDOMHTMLHeadingElement
+			         public nsIDOMHTMLHeadingElement
 {
 public:
   explicit HTMLHeadingElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
   }
 
   // nsISupports
--- a/dom/html/HTMLIFrameElement.h
+++ b/dom/html/HTMLIFrameElement.h
@@ -10,17 +10,17 @@
 #include "nsGenericHTMLFrameElement.h"
 #include "nsIDOMHTMLIFrameElement.h"
 #include "nsDOMSettableTokenList.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLIFrameElement final : public nsGenericHTMLFrameElement
-                                  , public nsIDOMHTMLIFrameElement
+                              , public nsIDOMHTMLIFrameElement
 {
 public:
   explicit HTMLIFrameElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                              FromParser aFromParser = NOT_FROM_PARSER);
 
   NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLIFrameElement, iframe)
 
   // nsISupports
--- a/dom/html/HTMLImageElement.h
+++ b/dom/html/HTMLImageElement.h
@@ -18,18 +18,18 @@
 #include "mozilla/dom/HTMLPictureElement.h"
 
 namespace mozilla {
 class EventChainPreVisitor;
 namespace dom {
 
 class ResponsiveImageSelector;
 class HTMLImageElement final : public nsGenericHTMLElement,
-                                   public nsImageLoadingContent,
-                                   public nsIDOMHTMLImageElement
+                               public nsImageLoadingContent,
+                               public nsIDOMHTMLImageElement
 {
   friend class HTMLSourceElement;
   friend class HTMLPictureElement;
   friend class ImageLoadTask;
 public:
   explicit HTMLImageElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   static already_AddRefed<HTMLImageElement>
--- a/dom/html/HTMLInputElement.h
+++ b/dom/html/HTMLInputElement.h
@@ -84,23 +84,23 @@ public:
 
     nsCOMPtr<nsIFilePicker> mFilePicker;
     nsCOMPtr<nsIFilePickerShownCallback> mFpCallback;
     nsCOMPtr<nsIContentPref> mResult;
   };
 };
 
 class HTMLInputElement final : public nsGenericHTMLFormElementWithState,
-                                   public nsImageLoadingContent,
-                                   public nsIDOMHTMLInputElement,
-                                   public nsITextControlElement,
-                                   public nsIPhonetic,
-                                   public nsIDOMNSEditableElement,
-                                   public nsITimerCallback,
-                                   public nsIConstraintValidation
+                               public nsImageLoadingContent,
+                               public nsIDOMHTMLInputElement,
+                               public nsITextControlElement,
+                               public nsIPhonetic,
+                               public nsIDOMNSEditableElement,
+                               public nsITimerCallback,
+                               public nsIConstraintValidation
 {
   friend class DirPickerFileListBuilderTask;
 
 public:
   using nsIConstraintValidation::GetValidationMessage;
   using nsIConstraintValidation::CheckValidity;
   using nsIConstraintValidation::WillValidate;
   using nsIConstraintValidation::Validity;
--- a/dom/html/HTMLLIElement.h
+++ b/dom/html/HTMLLIElement.h
@@ -10,17 +10,17 @@
 
 #include "nsIDOMHTMLLIElement.h"
 #include "nsGenericHTMLElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLLIElement final : public nsGenericHTMLElement,
-                                public nsIDOMHTMLLIElement
+                            public nsIDOMHTMLLIElement
 {
 public:
   explicit HTMLLIElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
   }
 
   // nsISupports
--- a/dom/html/HTMLLabelElement.h
+++ b/dom/html/HTMLLabelElement.h
@@ -13,17 +13,17 @@
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLLabelElement.h"
 
 namespace mozilla {
 class EventChainPostVisitor;
 namespace dom {
 
 class HTMLLabelElement final : public nsGenericHTMLFormElement,
-                                   public nsIDOMHTMLLabelElement
+                               public nsIDOMHTMLLabelElement
 {
 public:
   explicit HTMLLabelElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLFormElement(aNodeInfo),
       mHandlingEvent(false)
   {
   }
 
--- a/dom/html/HTMLLinkElement.h
+++ b/dom/html/HTMLLinkElement.h
@@ -14,19 +14,19 @@
 #include "nsStyleLinkElement.h"
 
 namespace mozilla {
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 namespace dom {
 
 class HTMLLinkElement final : public nsGenericHTMLElement,
-                                  public nsIDOMHTMLLinkElement,
-                                  public nsStyleLinkElement,
-                                  public Link
+                              public nsIDOMHTMLLinkElement,
+                              public nsStyleLinkElement,
+                              public Link
 {
 public:
   explicit HTMLLinkElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // CC
--- a/dom/html/HTMLMapElement.h
+++ b/dom/html/HTMLMapElement.h
@@ -13,17 +13,17 @@
 #include "nsGkAtoms.h"
 
 class nsContentList;
 
 namespace mozilla {
 namespace dom {
 
 class HTMLMapElement final : public nsGenericHTMLElement,
-                                 public nsIDOMHTMLMapElement
+                             public nsIDOMHTMLMapElement
 {
 public:
   explicit HTMLMapElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMHTMLMapElement
--- a/dom/html/HTMLMediaElement.cpp
+++ b/dom/html/HTMLMediaElement.cpp
@@ -253,19 +253,19 @@ public:
 
 /**
  * There is a reference cycle involving this class: MediaLoadListener
  * holds a reference to the HTMLMediaElement, which holds a reference
  * to an nsIChannel, which holds a reference to this listener.
  * We break the reference cycle in OnStartRequest by clearing mElement.
  */
 class HTMLMediaElement::MediaLoadListener final : public nsIStreamListener,
-                                                      public nsIChannelEventSink,
-                                                      public nsIInterfaceRequestor,
-                                                      public nsIObserver
+                                                  public nsIChannelEventSink,
+                                                  public nsIInterfaceRequestor,
+                                                  public nsIObserver
 {
   ~MediaLoadListener() {}
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSICHANNELEVENTSINK
   NS_DECL_NSIOBSERVER
--- a/dom/html/HTMLMenuElement.h
+++ b/dom/html/HTMLMenuElement.h
@@ -10,18 +10,18 @@
 #include "nsIDOMHTMLMenuElement.h"
 #include "nsIHTMLMenu.h"
 #include "nsGenericHTMLElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLMenuElement final : public nsGenericHTMLElement,
-                                  public nsIDOMHTMLMenuElement,
-                                  public nsIHTMLMenu
+                              public nsIDOMHTMLMenuElement,
+                              public nsIHTMLMenu
 {
 public:
   explicit HTMLMenuElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLMenuElement, menu)
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
--- a/dom/html/HTMLMenuItemElement.h
+++ b/dom/html/HTMLMenuItemElement.h
@@ -14,17 +14,17 @@ namespace mozilla {
 
 class EventChainPreVisitor;
 
 namespace dom {
 
 class Visitor;
 
 class HTMLMenuItemElement final : public nsGenericHTMLElement,
-                                      public nsIDOMHTMLMenuItemElement
+                                  public nsIDOMHTMLMenuItemElement
 {
 public:
   using mozilla::dom::Element::GetText;
 
   HTMLMenuItemElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                       mozilla::dom::FromParser aFromParser);
 
   NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLMenuItemElement, menuitem)
--- a/dom/html/HTMLMetaElement.h
+++ b/dom/html/HTMLMetaElement.h
@@ -9,17 +9,17 @@
 #include "mozilla/Attributes.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLMetaElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLMetaElement final : public nsGenericHTMLElement,
-                                  public nsIDOMHTMLMetaElement
+                              public nsIDOMHTMLMetaElement
 {
 public:
   explicit HTMLMetaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMHTMLMetaElement
--- a/dom/html/HTMLObjectElement.h
+++ b/dom/html/HTMLObjectElement.h
@@ -12,19 +12,19 @@
 #include "nsObjectLoadingContent.h"
 #include "nsIDOMHTMLObjectElement.h"
 #include "nsIConstraintValidation.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLObjectElement final : public nsGenericHTMLFormElement
-                                  , public nsObjectLoadingContent
-                                  , public nsIDOMHTMLObjectElement
-                                  , public nsIConstraintValidation
+                              , public nsObjectLoadingContent
+                              , public nsIDOMHTMLObjectElement
+                              , public nsIConstraintValidation
 {
 public:
   explicit HTMLObjectElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                              FromParser aFromParser = NOT_FROM_PARSER);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
--- a/dom/html/HTMLOptGroupElement.h
+++ b/dom/html/HTMLOptGroupElement.h
@@ -10,17 +10,17 @@
 #include "nsIDOMHTMLOptGroupElement.h"
 #include "nsGenericHTMLElement.h"
 
 namespace mozilla {
 class EventChainPreVisitor;
 namespace dom {
 
 class HTMLOptGroupElement final : public nsGenericHTMLElement,
-                                      public nsIDOMHTMLOptGroupElement
+                                  public nsIDOMHTMLOptGroupElement
 {
 public:
   explicit HTMLOptGroupElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLOptGroupElement, optgroup)
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
--- a/dom/html/HTMLOptionElement.h
+++ b/dom/html/HTMLOptionElement.h
@@ -13,17 +13,17 @@
 #include "mozilla/dom/HTMLFormElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLSelectElement;
 
 class HTMLOptionElement final : public nsGenericHTMLElement,
-                                    public nsIDOMHTMLOptionElement
+                                public nsIDOMHTMLOptionElement
 {
 public:
   explicit HTMLOptionElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   static already_AddRefed<HTMLOptionElement>
     Option(const GlobalObject& aGlobal,
            const Optional<nsAString>& aText,
            const Optional<nsAString>& aValue,
--- a/dom/html/HTMLOptionsCollection.h
+++ b/dom/html/HTMLOptionsCollection.h
@@ -26,18 +26,18 @@ class HTMLElementOrLong;
 class HTMLOptionElementOrHTMLOptGroupElement;
 class HTMLSelectElement;
 
 /**
  * The collection of options in the select (what you get back when you do
  * select.options in DOM)
  */
 class HTMLOptionsCollection final : public nsIHTMLCollection
-                                      , public nsIDOMHTMLOptionsCollection
-                                      , public nsWrapperCache
+                                  , public nsIDOMHTMLOptionsCollection
+                                  , public nsWrapperCache
 {
   typedef HTMLOptionElementOrHTMLOptGroupElement HTMLOptionOrOptGroupElement;
 public:
   explicit HTMLOptionsCollection(HTMLSelectElement* aSelect);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
 
   // nsWrapperCache
--- a/dom/html/HTMLOutputElement.h
+++ b/dom/html/HTMLOutputElement.h
@@ -10,18 +10,18 @@
 #include "nsGenericHTMLElement.h"
 #include "nsStubMutationObserver.h"
 #include "nsIConstraintValidation.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLOutputElement final : public nsGenericHTMLFormElement,
-                                    public nsStubMutationObserver,
-                                    public nsIConstraintValidation
+                                public nsStubMutationObserver,
+                                public nsIConstraintValidation
 {
 public:
   using nsIConstraintValidation::GetValidationMessage;
 
   explicit HTMLOutputElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                              FromParser aFromParser = NOT_FROM_PARSER);
 
   // nsISupports
--- a/dom/html/HTMLParagraphElement.h
+++ b/dom/html/HTMLParagraphElement.h
@@ -10,17 +10,17 @@
 
 #include "nsIDOMHTMLParagraphElement.h"
 #include "nsGenericHTMLElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLParagraphElement final : public nsGenericHTMLElement,
-                                       public nsIDOMHTMLParagraphElement
+                                   public nsIDOMHTMLParagraphElement
 {
 public:
   explicit HTMLParagraphElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
   }
 
   // nsISupports
--- a/dom/html/HTMLPictureElement.h
+++ b/dom/html/HTMLPictureElement.h
@@ -12,17 +12,17 @@
 #include "nsGenericHTMLElement.h"
 
 #include "mozilla/dom/HTMLUnknownElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLPictureElement final : public nsGenericHTMLElement,
-                                    public nsIDOMHTMLPictureElement
+                                 public nsIDOMHTMLPictureElement
 {
 public:
   explicit HTMLPictureElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // nsIDOMHTMLPictureElement
--- a/dom/html/HTMLPreElement.h
+++ b/dom/html/HTMLPreElement.h
@@ -10,17 +10,17 @@
 
 #include "nsIDOMHTMLPreElement.h"
 #include "nsGenericHTMLElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLPreElement final : public nsGenericHTMLElement,
-                                 public nsIDOMHTMLPreElement
+                             public nsIDOMHTMLPreElement
 {
 public:
   explicit HTMLPreElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
   }
 
   // nsISupports
--- a/dom/html/HTMLPropertiesCollection.h
+++ b/dom/html/HTMLPropertiesCollection.h
@@ -44,18 +44,18 @@ protected:
   virtual ~PropertyStringList();
 
   virtual void EnsureFresh() override;
 
   nsRefPtr<HTMLPropertiesCollection> mCollection;
 };
 
 class HTMLPropertiesCollection final : public nsIHTMLCollection,
-                                           public nsStubMutationObserver,
-                                           public nsWrapperCache
+                                       public nsStubMutationObserver,
+                                       public nsWrapperCache
 {
   friend class PropertyNodeList;
   friend class PropertyStringList;
 public:
   explicit HTMLPropertiesCollection(nsGenericHTMLElement* aRoot);
 
   // nsWrapperCache
   using nsWrapperCache::GetWrapperPreserveColor;
@@ -144,17 +144,17 @@ protected:
   // The document mRoot is in, if any
   nsCOMPtr<nsIDocument> mDoc;
 
   // True if there have been DOM modifications since the last EnsureFresh call.
   bool mIsDirty;
 };
 
 class PropertyNodeList final : public nsINodeList,
-                                   public nsStubMutationObserver
+                               public nsStubMutationObserver
 {
 public:
   PropertyNodeList(HTMLPropertiesCollection* aCollection,
                    nsIContent* aRoot, const nsAString& aName);
 
   virtual JSObject* WrapObject(JSContext *cx, JS::Handle<JSObject*> aGivenProto) override;
 
   void SetDocument(nsIDocument* aDocument);
--- a/dom/html/HTMLScriptElement.h
+++ b/dom/html/HTMLScriptElement.h
@@ -11,18 +11,18 @@
 #include "nsScriptElement.h"
 #include "nsGenericHTMLElement.h"
 #include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLScriptElement final : public nsGenericHTMLElement,
-                                    public nsIDOMHTMLScriptElement,
-                                    public nsScriptElement
+                                public nsIDOMHTMLScriptElement,
+                                public nsScriptElement
 {
 public:
   using Element::GetText;
   using Element::SetText;
 
   HTMLScriptElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                     FromParser aFromParser);
 
--- a/dom/html/HTMLSelectElement.h
+++ b/dom/html/HTMLSelectElement.h
@@ -108,18 +108,18 @@ private:
   nsMutationGuard            mGuard;
 };
 
 
 /**
  * Implementation of &lt;select&gt;
  */
 class HTMLSelectElement final : public nsGenericHTMLFormElementWithState,
-                                    public nsIDOMHTMLSelectElement,
-                                    public nsIConstraintValidation
+                                public nsIDOMHTMLSelectElement,
+                                public nsIConstraintValidation
 {
 public:
   /**
    *  IS_SELECTED   whether to set the option(s) to true or false
    *
    *  CLEAR_ALL     whether to clear all other options (for example, if you
    *                are normal-clicking on the current option)
    *
--- a/dom/html/HTMLShadowElement.h
+++ b/dom/html/HTMLShadowElement.h
@@ -7,17 +7,17 @@
 #define mozilla_dom_HTMLShadowElement_h__
 
 #include "nsGenericHTMLElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLShadowElement final : public nsGenericHTMLElement,
-                                    public nsStubMutationObserver
+                                public nsStubMutationObserver
 {
 public:
   explicit HTMLShadowElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLShadowElement, shadow)
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
--- a/dom/html/HTMLSharedElement.h
+++ b/dom/html/HTMLSharedElement.h
@@ -17,21 +17,21 @@
 
 #include "mozilla/Attributes.h"
 #include "mozilla/Assertions.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLSharedElement final : public nsGenericHTMLElement,
-                                    public nsIDOMHTMLBaseElement,
-                                    public nsIDOMHTMLDirectoryElement,
-                                    public nsIDOMHTMLQuoteElement,
-                                    public nsIDOMHTMLHeadElement,
-                                    public nsIDOMHTMLHtmlElement
+                                public nsIDOMHTMLBaseElement,
+                                public nsIDOMHTMLDirectoryElement,
+                                public nsIDOMHTMLQuoteElement,
+                                public nsIDOMHTMLHeadElement,
+                                public nsIDOMHTMLHtmlElement
 {
 public:
   explicit HTMLSharedElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
     if (mNodeInfo->Equals(nsGkAtoms::head) ||
         mNodeInfo->Equals(nsGkAtoms::html)) {
       SetHasWeirdParserInsertionMode();
--- a/dom/html/HTMLSharedListElement.h
+++ b/dom/html/HTMLSharedListElement.h
@@ -11,18 +11,18 @@
 #include "nsIDOMHTMLOListElement.h"
 #include "nsIDOMHTMLUListElement.h"
 #include "nsGenericHTMLElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLSharedListElement final : public nsGenericHTMLElement,
-                                        public nsIDOMHTMLOListElement,
-                                        public nsIDOMHTMLUListElement
+                                    public nsIDOMHTMLOListElement,
+                                    public nsIDOMHTMLUListElement
 {
 public:
   explicit HTMLSharedListElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
   }
 
   // nsISupports
--- a/dom/html/HTMLSharedObjectElement.h
+++ b/dom/html/HTMLSharedObjectElement.h
@@ -14,19 +14,19 @@
 #include "nsError.h"
 #include "nsIDOMHTMLAppletElement.h"
 #include "nsIDOMHTMLEmbedElement.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLSharedObjectElement final : public nsGenericHTMLElement
-                                        , public nsObjectLoadingContent
-                                        , public nsIDOMHTMLAppletElement
-                                        , public nsIDOMHTMLEmbedElement
+                                    , public nsObjectLoadingContent
+                                    , public nsIDOMHTMLAppletElement
+                                    , public nsIDOMHTMLEmbedElement
 {
 public:
   explicit HTMLSharedObjectElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                                    mozilla::dom::FromParser aFromParser = mozilla::dom::NOT_FROM_PARSER);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
--- a/dom/html/HTMLSourceElement.h
+++ b/dom/html/HTMLSourceElement.h
@@ -14,17 +14,17 @@
 
 class nsMediaList;
 
 namespace mozilla {
 namespace dom {
 
 class ResponsiveImageSelector;
 class HTMLSourceElement final : public nsGenericHTMLElement,
-                                    public nsIDOMHTMLSourceElement
+                                public nsIDOMHTMLSourceElement
 {
 public:
   explicit HTMLSourceElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLSourceElement, source)
--- a/dom/html/HTMLStyleElement.h
+++ b/dom/html/HTMLStyleElement.h
@@ -13,19 +13,19 @@
 #include "nsStubMutationObserver.h"
 
 class nsIDocument;
 
 namespace mozilla {
 namespace dom {
 
 class HTMLStyleElement final : public nsGenericHTMLElement,
-                                   public nsIDOMHTMLStyleElement,
-                                   public nsStyleLinkElement,
-                                   public nsStubMutationObserver
+                               public nsIDOMHTMLStyleElement,
+                               public nsStyleLinkElement,
+                               public nsStubMutationObserver
 {
 public:
   explicit HTMLStyleElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
 
   // CC
--- a/dom/html/HTMLTableCaptionElement.h
+++ b/dom/html/HTMLTableCaptionElement.h
@@ -8,17 +8,17 @@
 #include "mozilla/Attributes.h"
 #include "nsGenericHTMLElement.h"
 #include "nsIDOMHTMLTableCaptionElem.h"
 
 namespace mozilla {
 namespace dom {
 
 class HTMLTableCaptionElement final : public nsGenericHTMLElement,
-                                          public nsIDOMHTMLTableCaptionElement
+                                      public nsIDOMHTMLTableCaptionElement
 {
 public:
   explicit HTMLTableCaptionElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
     SetHasWeirdParserInsertionMode();
   }
 
--- a/dom/html/HTMLTableCellElement.h
+++ b/dom/html/HTMLTableCellElement.h
@@ -12,17 +12,17 @@
 class nsIDOMHTMLTableRowElement;
 
 namespace mozilla {
 namespace dom {
 
 class HTMLTableElement;
 
 class HTMLTableCellElement final : public nsGenericHTMLElement,
-                                       public nsIDOMHTMLTableCellElement
+                                   public nsIDOMHTMLTableCellElement
 {
 public:
   explicit HTMLTableCellElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo)
     : nsGenericHTMLElement(aNodeInfo)
   {
     SetHasWeirdParserInsertionMode();
   }
 
--- a/dom/html/HTMLTableElement.h
+++ b/dom/html/HTMLTableElement.h
@@ -14,17 +14,17 @@
 namespace mozilla {
 namespace dom {
 
 #define TABLE_ATTRS_DIRTY ((nsMappedAttributes*)0x1)
 
 class TableRowsCollection;
 
 class HTMLTableElement final : public nsGenericHTMLElement,
-                                   public nsIDOMHTMLTableElement
+                               public nsIDOMHTMLTableElement
 {
 public:
   explicit HTMLTableElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   NS_IMPL_FROMCONTENT_HTML_WITH_TAG(HTMLTableElement, table)
 
   // nsISupports
   NS_DECL_ISUPPORTS_INHERITED
--- a/dom/html/HTMLTextAreaElement.h
+++ b/dom/html/HTMLTextAreaElement.h
@@ -31,21 +31,21 @@ namespace mozilla {
 
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 class EventStates;
 
 namespace dom {
 
 class HTMLTextAreaElement final : public nsGenericHTMLFormElementWithState,
-                                      public nsIDOMHTMLTextAreaElement,
-                                      public nsITextControlElement,
-                                      public nsIDOMNSEditableElement,
-                                      public nsStubMutationObserver,
-                                      public nsIConstraintValidation
+                                  public nsIDOMHTMLTextAreaElement,
+                                  public nsITextControlElement,
+                                  public nsIDOMNSEditableElement,
+                                  public nsStubMutationObserver,
+                                  public nsIConstraintValidation
 {
 public:
   using nsIConstraintValidation::GetValidationMessage;
 
   explicit HTMLTextAreaElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                                FromParser aFromParser = NOT_FROM_PARSER);
 
   // nsISupports
--- a/dom/html/HTMLTitleElement.h
+++ b/dom/html/HTMLTitleElement.h
@@ -12,18 +12,18 @@
 #include "nsStubMutationObserver.h"
 
 namespace mozilla {
 class ErrorResult;
 
 namespace dom {
 
 class HTMLTitleElement final : public nsGenericHTMLElement,
-                                   public nsIDOMHTMLTitleElement,
-                                   public nsStubMutationObserver
+                               public nsIDOMHTMLTitleElement,
+                               public nsStubMutationObserver
 {
 public:
   using Element::GetText;
   using Element::SetText;
 
   explicit HTMLTitleElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
 
   // nsISupports
--- a/dom/html/ImageDocument.h
+++ b/dom/html/ImageDocument.h
@@ -10,19 +10,19 @@
 #include "MediaDocument.h"
 #include "nsIDOMEventListener.h"
 #include "nsIImageDocument.h"
 
 namespace mozilla {
 namespace dom {
 
 class ImageDocument final : public MediaDocument,
-                                public nsIImageDocument,
-                                public imgINotificationObserver,
-                                public nsIDOMEventListener
+                            public nsIImageDocument,
+                            public imgINotificationObserver,
+                            public nsIDOMEventListener
 {
 public:
   ImageDocument();
 
   NS_DECL_ISUPPORTS_INHERITED
 
   virtual nsresult Init() override;
 
--- a/dom/html/MediaError.h
+++ b/dom/html/MediaError.h
@@ -12,17 +12,17 @@
 #include "nsWrapperCache.h"
 #include "nsISupports.h"
 #include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace dom {
 
 class MediaError final : public nsIDOMMediaError,
-                             public nsWrapperCache
+                         public nsWrapperCache
 {
   ~MediaError() {}
 
 public:
   MediaError(HTMLMediaElement* aParent, uint16_t aCode);
 
   // nsISupports
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
--- a/dom/html/PluginDocument.cpp
+++ b/dom/html/PluginDocument.cpp
@@ -18,17 +18,17 @@
 #include "mozilla/dom/Element.h"
 #include "nsObjectLoadingContent.h"
 #include "GeckoProfiler.h"
 
 namespace mozilla {
 namespace dom {
 
 class PluginDocument final : public MediaDocument
-                               , public nsIPluginDocument
+                           , public nsIPluginDocument
 {
 public:
   PluginDocument();
 
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIPLUGINDOCUMENT
 
   virtual nsresult StartDocumentLoad(const char*         aCommand,
--- a/dom/html/UndoManager.h
+++ b/dom/html/UndoManager.h
@@ -21,17 +21,17 @@ class nsIMutationObserver;
 namespace mozilla {
 class ErrorResult;
 namespace dom {
 
 class DOMTransaction;
 class DOMTransactionCallback;
 
 class UndoManager final : public nsISupports,
-                              public nsWrapperCache
+                          public nsWrapperCache
 {
   friend class TxnScopeGuard;
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(UndoManager)
 
   explicit UndoManager(nsIContent* aNode);
 
--- a/dom/html/ValidityState.h
+++ b/dom/html/ValidityState.h
@@ -10,17 +10,17 @@
 #include "nsIConstraintValidation.h"
 #include "nsWrapperCache.h"
 #include "js/TypeDecls.h"
 
 namespace mozilla {
 namespace dom {
 
 class ValidityState final : public nsIDOMValidityState,
-                                public nsWrapperCache
+                            public nsWrapperCache
 {
   ~ValidityState() {}
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(ValidityState)
   NS_DECL_NSIDOMVALIDITYSTATE
 
--- a/dom/html/nsHTMLDNSPrefetch.h
+++ b/dom/html/nsHTMLDNSPrefetch.h
@@ -77,18 +77,18 @@ public:
     NS_DECL_NSIDNSLISTENER
 
     nsListener()  {}
   private:
     ~nsListener() {}
   };
   
   class nsDeferrals final: public nsIWebProgressListener
-                             , public nsSupportsWeakReference
-                             , public nsIObserver
+                         , public nsSupportsWeakReference
+                         , public nsIObserver
   {
   public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIWEBPROGRESSLISTENER
     NS_DECL_NSIOBSERVER
 
     nsDeferrals();
     
--- a/dom/html/nsTextEditorState.cpp
+++ b/dom/html/nsTextEditorState.cpp
@@ -194,17 +194,17 @@ public:
   NS_DECL_NSIMUTATIONOBSERVER_CONTENTREMOVED
 
 private:
   ~nsAnonDivObserver() {}
   nsTextEditorState* mTextEditorState;
 };
 
 class nsTextInputSelectionImpl final : public nsSupportsWeakReference
-                                         , public nsISelectionController
+                                     , public nsISelectionController
 {
   ~nsTextInputSelectionImpl(){}
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsTextInputSelectionImpl, nsISelectionController)
 
   nsTextInputSelectionImpl(nsFrameSelection *aSel, nsIPresShell *aShell, nsIContent *aLimiter);
--- a/dom/indexedDB/IDBFileHandle.h
+++ b/dom/indexedDB/IDBFileHandle.h
@@ -24,19 +24,19 @@ namespace dom {
 
 struct IDBFileMetadataParameters;
 
 namespace indexedDB {
 
 class IDBMutableFile;
 
 class IDBFileHandle final : public DOMEventTargetHelper,
-                                public nsIRunnable,
-                                public FileHandleBase,
-                                public nsSupportsWeakReference
+                            public nsIRunnable,
+                            public FileHandleBase,
+                            public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIRUNNABLE
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(IDBFileHandle, DOMEventTargetHelper)
 
   static already_AddRefed<IDBFileHandle>
--- a/dom/indexedDB/IDBFileRequest.h
+++ b/dom/indexedDB/IDBFileRequest.h
@@ -21,17 +21,17 @@ namespace mozilla {
 class EventChainPreVisitor;
 
 namespace dom {
 namespace indexedDB {
 
 class IDBFileHandle;
 
 class IDBFileRequest final : public DOMRequest,
-                                 public FileRequestBase
+                             public FileRequestBase
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
 
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(IDBFileRequest, DOMRequest)
 
   static already_AddRefed<IDBFileRequest>
   Create(nsPIDOMWindow* aOwner, IDBFileHandle* aFileHandle,
--- a/dom/ipc/ContentBridgeChild.h
+++ b/dom/ipc/ContentBridgeChild.h
@@ -9,17 +9,17 @@
 
 #include "mozilla/dom/PContentBridgeChild.h"
 #include "mozilla/dom/nsIContentChild.h"
 
 namespace mozilla {
 namespace dom {
 
 class ContentBridgeChild final : public PContentBridgeChild
-                                   , public nsIContentChild
+                               , public nsIContentChild
 {
 public:
   explicit ContentBridgeChild(Transport* aTransport);
 
   NS_DECL_ISUPPORTS
 
   static ContentBridgeChild*
   Create(Transport* aTransport, ProcessId aOtherProcess);
--- a/dom/ipc/ContentParent.cpp
+++ b/dom/ipc/ContentParent.cpp
@@ -236,17 +236,17 @@ using namespace mozilla::ipc;
 using namespace mozilla::layers;
 using namespace mozilla::net;
 using namespace mozilla::jsipc;
 using namespace mozilla::widget;
 
 #ifdef ENABLE_TESTS
 
 class BackgroundTester final : public nsIIPCBackgroundChildCreateCallback,
-                                   public nsIObserver
+                               public nsIObserver
 {
     static uint32_t sCallbackCount;
 
 private:
     ~BackgroundTester()
     { }
 
     virtual void
--- a/dom/ipc/ContentParent.h
+++ b/dom/ipc/ContentParent.h
@@ -62,21 +62,21 @@ class Element;
 class TabParent;
 class PStorageParent;
 class ClonedMessageData;
 class MemoryReport;
 class TabContext;
 class ContentBridgeParent;
 
 class ContentParent final : public PContentParent
-                              , public nsIContentParent
-                              , public nsIObserver
-                              , public nsIDOMGeoPositionCallback
-                              , public nsIDOMGeoPositionErrorCallback
-                              , public mozilla::LinkedListElement<ContentParent>
+                          , public nsIContentParent
+                          , public nsIObserver
+                          , public nsIDOMGeoPositionCallback
+                          , public nsIDOMGeoPositionErrorCallback
+                          , public mozilla::LinkedListElement<ContentParent>
 {
     typedef mozilla::ipc::GeckoChildProcessHost GeckoChildProcessHost;
     typedef mozilla::ipc::OptionalURIParams OptionalURIParams;
     typedef mozilla::ipc::PFileDescriptorSetParent PFileDescriptorSetParent;
     typedef mozilla::ipc::TestShellParent TestShellParent;
     typedef mozilla::ipc::URIParams URIParams;
     typedef mozilla::dom::ClonedMessageData ClonedMessageData;
 
--- a/dom/ipc/TabChild.h
+++ b/dom/ipc/TabChild.h
@@ -221,29 +221,29 @@ protected:
     bool mContentDocumentIsDisplayed;
     nsRefPtr<TabChildGlobal> mTabChildGlobal;
     ScreenIntSize mInnerSize;
     mozilla::layers::FrameMetrics mLastRootMetrics;
     nsCOMPtr<nsIWebBrowserChrome3> mWebBrowserChrome;
 };
 
 class TabChild final : public TabChildBase,
-                           public PBrowserChild,
-                           public nsIWebBrowserChrome2,
-                           public nsIEmbeddingSiteWindow,
-                           public nsIWebBrowserChromeFocus,
-                           public nsIInterfaceRequestor,
-                           public nsIWindowProvider,
-                           public nsIDOMEventListener,
-                           public nsIWebProgressListener,
-                           public nsSupportsWeakReference,
-                           public nsITabChild,
-                           public nsIObserver,
-                           public TabContext,
-                           public nsITooltipListener
+                       public PBrowserChild,
+                       public nsIWebBrowserChrome2,
+                       public nsIEmbeddingSiteWindow,
+                       public nsIWebBrowserChromeFocus,
+                       public nsIInterfaceRequestor,
+                       public nsIWindowProvider,
+                       public nsIDOMEventListener,
+                       public nsIWebProgressListener,
+                       public nsSupportsWeakReference,
+                       public nsITabChild,
+                       public nsIObserver,
+                       public TabContext,
+                       public nsITooltipListener
 {
     typedef mozilla::dom::ClonedMessageData ClonedMessageData;
     typedef mozilla::layout::RenderFrameChild RenderFrameChild;
     typedef mozilla::layers::APZEventState APZEventState;
     typedef mozilla::layers::SetTargetAPZCCallback SetTargetAPZCCallback;
     typedef mozilla::layers::SetAllowedTouchBehaviorCallback SetAllowedTouchBehaviorCallback;
 
 public:
--- a/dom/ipc/TabParent.cpp
+++ b/dom/ipc/TabParent.cpp
@@ -2791,19 +2791,19 @@ TabParent::HandleEvent(nsIDOMEvent* aEve
     NS_ENSURE_SUCCESS(frameLoader->GetWindowDimensions(windowDims), NS_ERROR_FAILURE);
     UpdateDimensions(windowDims, mDimensions);
     return NS_OK;
   }
   return NS_OK;
 }
 
 class FakeChannel final : public nsIChannel,
-                              public nsIAuthPromptCallback,
-                              public nsIInterfaceRequestor,
-                              public nsILoadContext
+                          public nsIAuthPromptCallback,
+                          public nsIInterfaceRequestor,
+                          public nsILoadContext
 {
 public:
   FakeChannel(const nsCString& aUri, uint64_t aCallbackId, Element* aElement)
     : mCallbackId(aCallbackId)
     , mElement(aElement)
   {
     NS_NewURI(getter_AddRefs(mUri), aUri);
   }
--- a/dom/mathml/nsMathMLElement.h
+++ b/dom/mathml/nsMathMLElement.h
@@ -21,18 +21,18 @@ namespace mozilla {
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 } // namespace mozilla
 
 /*
  * The base class for MathML elements.
  */
 class nsMathMLElement final : public nsMathMLElementBase,
-                                  public nsIDOMElement,
-                                  public mozilla::dom::Link
+                              public nsIDOMElement,
+                              public mozilla::dom::Link
 {
 public:
   explicit nsMathMLElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
   explicit nsMathMLElement(already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
   // Implementation of nsISupports is inherited from nsMathMLElementBase
   NS_DECL_ISUPPORTS_INHERITED
 
--- a/dom/media/MediaCache.cpp
+++ b/dom/media/MediaCache.cpp
@@ -62,17 +62,18 @@ static const uint32_t FREE_BLOCK_SCAN_LI
 #endif
 
 // There is at most one media cache (although that could quite easily be
 // relaxed if we wanted to manage multiple caches with independent
 // size limits).
 static MediaCache* gMediaCache;
 
 class MediaCacheFlusher final : public nsIObserver,
-                                      public nsSupportsWeakReference {
+                                public nsSupportsWeakReference
+{
   MediaCacheFlusher() {}
   ~MediaCacheFlusher();
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
 
   static void Init();
 };
--- a/dom/media/MediaManager.h
+++ b/dom/media/MediaManager.h
@@ -540,17 +540,17 @@ public:
 
 // we could add MediaManager if needed
 typedef void (*WindowListenerCallback)(MediaManager *aThis,
                                        uint64_t aWindowID,
                                        StreamListeners *aListeners,
                                        void *aData);
 
 class MediaManager final : public nsIMediaManagerService,
-                               public nsIObserver
+                           public nsIObserver
 {
 public:
   static already_AddRefed<MediaManager> GetInstance();
 
   // NOTE: never Dispatch(....,NS_DISPATCH_SYNC) to the MediaManager
   // thread from the MainThread, as we NS_DISPATCH_SYNC to MainThread
   // from MediaManager thread.
   static MediaManager* Get();
--- a/dom/media/MediaRecorder.h
+++ b/dom/media/MediaRecorder.h
@@ -34,17 +34,17 @@ class AudioNode;
  * Encoder will get the raw data by track data changes, encode it by selected MIME Type, then store the encoded in EncodedBufferCache object.
  * The encoded data will be extracted on every timeslice passed from Start function call or by RequestData function.
  * Thread model:
  * When the recorder starts, it creates a "Media Encoder" thread to read data from MediaEncoder object and store buffer in EncodedBufferCache object.
  * Also extract the encoded data and create blobs on every timeslice passed from start function or RequestData function called by UA.
  */
 
 class MediaRecorder final : public DOMEventTargetHelper,
-                                public nsIDocumentActivity
+                            public nsIDocumentActivity
 {
   class Session;
 
 public:
   MediaRecorder(DOMMediaStream& aSourceMediaStream, nsPIDOMWindow* aOwnerWindow);
   MediaRecorder(AudioNode& aSrcAudioNode, uint32_t aSrcOutput, nsPIDOMWindow* aOwnerWindow);
 
   // nsWrapperCache
--- a/dom/media/MediaResource.h
+++ b/dom/media/MediaResource.h
@@ -626,18 +626,18 @@ public:
   }
 
   virtual size_t SizeOfIncludingThis(
                       MallocSizeOf aMallocSizeOf) const override {
     return aMallocSizeOf(this) + SizeOfExcludingThis(aMallocSizeOf);
   }
 
   class Listener final : public nsIStreamListener,
-                             public nsIInterfaceRequestor,
-                             public nsIChannelEventSink
+                         public nsIInterfaceRequestor,
+                         public nsIChannelEventSink
   {
     ~Listener() {}
   public:
     explicit Listener(ChannelMediaResource* aResource) : mResource(aResource) {}
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIREQUESTOBSERVER
     NS_DECL_NSISTREAMLISTENER
--- a/dom/media/MediaStreamError.h
+++ b/dom/media/MediaStreamError.h
@@ -36,34 +36,34 @@ protected:
                     const nsAString& aMessage,
                     const nsAString& aConstraintName);
   const nsString mName;
   nsString mMessage;
   const nsString mConstraintName;
 };
 
 class MediaMgrError final : public nsISupports,
-                                public BaseMediaMgrError
+                            public BaseMediaMgrError
 {
 public:
   explicit MediaMgrError(const nsAString& aName,
                          const nsAString& aMessage =  EmptyString(),
                          const nsAString& aConstraintName =  EmptyString())
   : BaseMediaMgrError(aName, aMessage, aConstraintName) {}
 
   NS_DECL_THREADSAFE_ISUPPORTS
 
 private:
   ~MediaMgrError() {}
 };
 
 namespace dom {
 class MediaStreamError final : public nsISupports,
-                                   public BaseMediaMgrError,
-                                   public nsWrapperCache
+                               public BaseMediaMgrError,
+                               public nsWrapperCache
 {
 public:
   MediaStreamError(nsPIDOMWindow* aParent,
                    const nsAString& aName,
                    const nsAString& aMessage = EmptyString(),
                    const nsAString& aConstraintName =  EmptyString());
 
   MediaStreamError(nsPIDOMWindow* aParent,
--- a/dom/media/RTCIdentityProviderRegistrar.h
+++ b/dom/media/RTCIdentityProviderRegistrar.h
@@ -16,17 +16,17 @@
 #include "mozilla/dom/BindingDeclarations.h"
 
 namespace mozilla {
 namespace dom {
 
 class RTCIdentityProvider;
 
 class RTCIdentityProviderRegistrar final : public nsISupports,
-                                               public nsWrapperCache
+                                           public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(RTCIdentityProviderRegistrar)
 
   explicit RTCIdentityProviderRegistrar(nsIGlobalObject* aGlobal);
 
   // As required
--- a/dom/media/RtspMediaResource.h
+++ b/dom/media/RtspMediaResource.h
@@ -204,17 +204,17 @@ public:
   }
 
   // Listener implements nsIStreamingProtocolListener as
   // mMediaStreamController's callback function.
   // It holds RtspMediaResource reference to notify the connection status and
   // data arrival. The Revoke function releases the reference when
   // RtspMediaResource::OnDisconnected is called.
   class Listener final : public nsIInterfaceRequestor,
-                             public nsIStreamingProtocolListener
+                         public nsIStreamingProtocolListener
   {
     ~Listener() {}
   public:
     explicit Listener(RtspMediaResource* aResource) : mResource(aResource) {}
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIINTERFACEREQUESTOR
     NS_DECL_NSISTREAMINGPROTOCOLLISTENER
--- a/dom/media/TextTrackCueList.h
+++ b/dom/media/TextTrackCueList.h
@@ -14,17 +14,17 @@
 #include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {
 
 class TextTrackCue;
 
 class TextTrackCueList final : public nsISupports
-                                 , public nsWrapperCache
+                             , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(TextTrackCueList)
 
   // TextTrackCueList WebIDL
   explicit TextTrackCueList(nsISupports* aParent);
 
--- a/dom/media/TextTrackRegion.h
+++ b/dom/media/TextTrackRegion.h
@@ -17,17 +17,17 @@
 
 namespace mozilla {
 namespace dom {
 
 class GlobalObject;
 class TextTrack;
 
 class TextTrackRegion final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(TextTrackRegion)
 
   static bool RegionsEnabled(JSContext* cx, JSObject* obj)
   {
--- a/dom/media/WebVTTListener.h
+++ b/dom/media/WebVTTListener.h
@@ -16,19 +16,19 @@
 class nsIWebVTTParserWrapper;
 
 namespace mozilla {
 namespace dom {
 
 class HTMLTrackElement;
 
 class WebVTTListener final : public nsIWebVTTListener,
-                                 public nsIStreamListener,
-                                 public nsIChannelEventSink,
-                                 public nsIInterfaceRequestor
+                             public nsIStreamListener,
+                             public nsIChannelEventSink,
+                             public nsIInterfaceRequestor
 {
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_NSIWEBVTTLISTENER
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSICHANNELEVENTSINK
   NS_DECL_NSIINTERFACEREQUESTOR
 
--- a/dom/media/eme/MediaKeyStatusMap.h
+++ b/dom/media/eme/MediaKeyStatusMap.h
@@ -19,17 +19,17 @@
 class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 
 class ArrayBufferViewOrArrayBuffer;
 
 class MediaKeyStatusMap final : public nsISupports,
-                                    public nsWrapperCache
+                                public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MediaKeyStatusMap)
 
 public:
   explicit MediaKeyStatusMap(JSContext* aCx,
                              nsPIDOMWindow* aParent,
--- a/dom/media/eme/MediaKeySystemAccess.h
+++ b/dom/media/eme/MediaKeySystemAccess.h
@@ -17,17 +17,17 @@
 #include "mozilla/dom/MediaKeysRequestStatusBinding.h"
 
 #include "js/TypeDecls.h"
 
 namespace mozilla {
 namespace dom {
 
 class MediaKeySystemAccess final : public nsISupports,
-                                       public nsWrapperCache
+                                   public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MediaKeySystemAccess)
 
 public:
   explicit MediaKeySystemAccess(nsPIDOMWindow* aParent,
                                 const nsAString& aKeySystem);
--- a/dom/media/gmp/GMPAudioDecoderParent.h
+++ b/dom/media/gmp/GMPAudioDecoderParent.h
@@ -14,17 +14,17 @@
 #include "GMPAudioDecoderProxy.h"
 
 namespace mozilla {
 namespace gmp {
 
 class GMPParent;
 
 class GMPAudioDecoderParent final : public GMPAudioDecoderProxy
-                                      , public PGMPAudioDecoderParent
+                                  , public PGMPAudioDecoderParent
 {
 public:
   NS_INLINE_DECL_REFCOUNTING(GMPAudioDecoderParent)
 
   explicit GMPAudioDecoderParent(GMPParent *aPlugin);
 
   nsresult Shutdown();
 
--- a/dom/media/gmp/GMPVideoDecoderParent.h
+++ b/dom/media/gmp/GMPVideoDecoderParent.h
@@ -16,18 +16,18 @@
 #include "GMPVideoDecoderProxy.h"
 
 namespace mozilla {
 namespace gmp {
 
 class GMPParent;
 
 class GMPVideoDecoderParent final : public PGMPVideoDecoderParent
-                                      , public GMPVideoDecoderProxy
-                                      , public GMPSharedMemManager
+                                  , public GMPVideoDecoderProxy
+                                  , public GMPSharedMemManager
 {
 public:
   NS_INLINE_DECL_REFCOUNTING(GMPVideoDecoderParent)
 
   explicit GMPVideoDecoderParent(GMPParent *aPlugin);
 
   GMPVideoHostImpl& Host();
   nsresult Shutdown();
--- a/dom/media/systemservices/LoadManager.h
+++ b/dom/media/systemservices/LoadManager.h
@@ -68,17 +68,17 @@ private:
     int mAveragingMeasurements;
     float mHighLoadThreshold;
     float mLowLoadThreshold;
 
     static StaticRefPtr<LoadManagerSingleton> sSingleton;
 };
 
 class LoadManager final : public webrtc::CPULoadStateCallbackInvoker,
-                              public webrtc::CpuOveruseObserver
+                          public webrtc::CpuOveruseObserver
 {
 public:
     explicit LoadManager(LoadManagerSingleton* aManager)
         : mManager(aManager)
     {}
     ~LoadManager() {}
 
     void AddObserver(webrtc::CPULoadStateObserver * aObserver) override
--- a/dom/media/webaudio/AudioContext.h
+++ b/dom/media/webaudio/AudioContext.h
@@ -60,17 +60,17 @@ class OscillatorNode;
 class PannerNode;
 class ScriptProcessorNode;
 class StereoPannerNode;
 class WaveShaperNode;
 class PeriodicWave;
 class Promise;
 
 class AudioContext final : public DOMEventTargetHelper,
-                               public nsIMemoryReporter
+                           public nsIMemoryReporter
 {
   AudioContext(nsPIDOMWindow* aParentWindow,
                bool aIsOffline,
                AudioChannel aChannel,
                uint32_t aNumberOfChannels = 0,
                uint32_t aLength = 0,
                float aSampleRate = 0.0f);
   ~AudioContext();
--- a/dom/media/webaudio/AudioDestinationNode.h
+++ b/dom/media/webaudio/AudioDestinationNode.h
@@ -15,19 +15,19 @@
 
 namespace mozilla {
 namespace dom {
 
 class AudioContext;
 class EventProxyHandler;
 
 class AudioDestinationNode final : public AudioNode
-                                     , public nsIDOMEventListener
-                                     , public nsIAudioChannelAgentCallback
-                                     , public MainThreadMediaStreamListener
+                                 , public nsIDOMEventListener
+                                 , public nsIAudioChannelAgentCallback
+                                 , public MainThreadMediaStreamListener
 {
 public:
   // This node type knows what MediaStreamGraph to use based on
   // whether it's in offline mode.
   AudioDestinationNode(AudioContext* aContext,
                        bool aIsOffline,
                        AudioChannel aChannel = AudioChannel::Normal,
                        uint32_t aNumberOfChannels = 0,
--- a/dom/media/webaudio/AudioParam.h
+++ b/dom/media/webaudio/AudioParam.h
@@ -16,17 +16,17 @@
 #include "WebAudioUtils.h"
 #include "js/TypeDecls.h"
 
 namespace mozilla {
 
 namespace dom {
 
 class AudioParam final : public nsWrapperCache,
-                             public AudioParamTimeline
+                         public AudioParamTimeline
 {
   virtual ~AudioParam();
 
 public:
   typedef void (*CallbackType)(AudioNode*);
 
   AudioParam(AudioNode* aNode,
              CallbackType aCallback,
--- a/dom/media/webspeech/recognition/SpeechGrammar.h
+++ b/dom/media/webspeech/recognition/SpeechGrammar.h
@@ -17,17 +17,17 @@
 #include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {
 
 class GlobalObject;
 
 class SpeechGrammar final : public nsISupports,
-                                public nsWrapperCache
+                            public nsWrapperCache
 {
 public:
   explicit SpeechGrammar(nsISupports* aParent);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SpeechGrammar)
 
   nsISupports* GetParentObject() const;
--- a/dom/media/webspeech/recognition/SpeechGrammarList.h
+++ b/dom/media/webspeech/recognition/SpeechGrammarList.h
@@ -21,17 +21,17 @@ class ErrorResult;
 
 namespace dom {
 
 class GlobalObject;
 class SpeechGrammar;
 template<typename> class Optional;
 
 class SpeechGrammarList final : public nsISupports,
-                                    public nsWrapperCache
+                                public nsWrapperCache
 {
 public:
   explicit SpeechGrammarList(nsISupports* aParent, nsISpeechRecognitionService* aRecognitionService);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SpeechGrammarList)
 
   static already_AddRefed<SpeechGrammarList> Constructor(const GlobalObject& aGlobal, ErrorResult& aRv);
--- a/dom/media/webspeech/recognition/SpeechRecognition.h
+++ b/dom/media/webspeech/recognition/SpeechRecognition.h
@@ -51,18 +51,18 @@ PRLogModuleInfo* GetSpeechRecognitionLog
 #define SR_LOG(...) PR_LOG(GetSpeechRecognitionLog(), PR_LOG_DEBUG, (__VA_ARGS__))
 #else
 #define SR_LOG(...)
 #endif
 
 already_AddRefed<nsISpeechRecognitionService> GetSpeechRecognitionService();
 
 class SpeechRecognition final : public DOMEventTargetHelper,
-                                    public nsIObserver,
-                                    public SupportsWeakPtr<SpeechRecognition>
+                                public nsIObserver,
+                                public SupportsWeakPtr<SpeechRecognition>
 {
 public:
   MOZ_DECLARE_REFCOUNTED_TYPENAME(SpeechRecognition)
   explicit SpeechRecognition(nsPIDOMWindow* aOwnerWindow);
 
   NS_DECL_ISUPPORTS_INHERITED
 
   NS_DECL_NSIOBSERVER
--- a/dom/media/webspeech/recognition/SpeechRecognitionAlternative.h
+++ b/dom/media/webspeech/recognition/SpeechRecognitionAlternative.h
@@ -16,17 +16,17 @@
 #include "mozilla/Attributes.h"
 
 namespace mozilla {
 namespace dom {
 
 class SpeechRecognition;
 
 class SpeechRecognitionAlternative final : public nsISupports,
-                                               public nsWrapperCache
+                                           public nsWrapperCache
 {
 public:
   explicit SpeechRecognitionAlternative(SpeechRecognition* aParent);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SpeechRecognitionAlternative)
 
   nsISupports* GetParentObject() const;
--- a/dom/media/webspeech/recognition/SpeechRecognitionResult.h
+++ b/dom/media/webspeech/recognition/SpeechRecognitionResult.h
@@ -17,17 +17,17 @@
 #include "mozilla/Attributes.h"
 
 #include "SpeechRecognitionAlternative.h"
 
 namespace mozilla {
 namespace dom {
 
 class SpeechRecognitionResult final : public nsISupports,
-                                          public nsWrapperCache
+                                      public nsWrapperCache
 {
 public:
   explicit SpeechRecognitionResult(SpeechRecognition* aParent);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SpeechRecognitionResult)
 
   nsISupports* GetParentObject() const;
--- a/dom/media/webspeech/recognition/SpeechRecognitionResultList.h
+++ b/dom/media/webspeech/recognition/SpeechRecognitionResultList.h
@@ -18,17 +18,17 @@
 #include "SpeechRecognitionResult.h"
 
 namespace mozilla {
 namespace dom {
 
 class SpeechRecognition;
 
 class SpeechRecognitionResultList final : public nsISupports,
-                                              public nsWrapperCache
+                                          public nsWrapperCache
 {
 public:
   explicit SpeechRecognitionResultList(SpeechRecognition* aParent);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SpeechRecognitionResultList)
 
   nsISupports* GetParentObject() const;
--- a/dom/media/webspeech/synth/SpeechSynthesis.h
+++ b/dom/media/webspeech/synth/SpeechSynthesis.h
@@ -19,17 +19,17 @@
 class nsIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 
 class nsSpeechTask;
 
 class SpeechSynthesis final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
   explicit SpeechSynthesis(nsPIDOMWindow* aParent);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(SpeechSynthesis)
 
   nsIDOMWindow* GetParentObject() const;
--- a/dom/media/webspeech/synth/SpeechSynthesisVoice.h
+++ b/dom/media/webspeech/synth/SpeechSynthesisVoice.h
@@ -16,17 +16,17 @@
 
 namespace mozilla {
 namespace dom {
 
 class nsSynthVoiceRegistry;
 class SpeechSynthesis;
 
 class SpeechSynthesisVoice final : public nsISupports,
-                                       public nsWrapperCache
+                                   public nsWrapperCache
 {
   friend class nsSynthVoiceRegistry;
   friend class SpeechSynthesis;
 
 public:
   SpeechSynthesisVoice(nsISupports* aParent, const nsAString& aUri);
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
--- a/dom/media/wmf/WMFByteStream.h
+++ b/dom/media/wmf/WMFByteStream.h
@@ -29,17 +29,17 @@ class SharedThreadPool;
 // using Read().
 //
 // Note: This implementation attempts to be bug-compatible with Windows Media
 //       Foundation's implementation of IMFByteStream. The behaviour of WMF's
 //       IMFByteStream was determined by creating it and testing the edge cases.
 //       For details see the test code at:
 //       https://github.com/cpearce/IMFByteStreamBehaviour/
 class WMFByteStream final : public IMFByteStream
-                              , public IMFAttributes
+                          , public IMFAttributes
 {
   ~WMFByteStream();
 
 public:
   WMFByteStream(MediaResource* aResource, WMFSourceReaderCallback* aCallback);
 
   nsresult Init();
   nsresult Shutdown();
--- a/dom/mobileconnection/MobileCellInfo.h
+++ b/dom/mobileconnection/MobileCellInfo.h
@@ -10,17 +10,17 @@
 #include "nsIMobileCellInfo.h"
 #include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {
 
 class MobileCellInfo final : public nsIMobileCellInfo
-                               , public nsWrapperCache
+                           , public nsWrapperCache
 {
 public:
   NS_DECL_NSIMOBILECELLINFO
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MobileCellInfo)
 
   explicit MobileCellInfo(nsPIDOMWindow* aWindow);
 
--- a/dom/mobileconnection/MobileConnection.cpp
+++ b/dom/mobileconnection/MobileConnection.cpp
@@ -45,17 +45,17 @@
 }
 
 using mozilla::ErrorResult;
 using namespace mozilla::dom;
 using namespace mozilla::dom::mobileconnection;
 
 class MobileConnection::Listener final : public nsIMobileConnectionListener
 #ifdef MOZ_B2G_RIL
-                                           , public nsIIccListener
+                                       , public nsIIccListener
 #endif // MOZ_B2G_RIL
 {
   MobileConnection* mMobileConnection;
 
 public:
   NS_DECL_ISUPPORTS
   NS_FORWARD_SAFE_NSIMOBILECONNECTIONLISTENER(mMobileConnection)
 #ifdef MOZ_B2G_RIL
--- a/dom/mobileconnection/MobileConnection.h
+++ b/dom/mobileconnection/MobileConnection.h
@@ -17,19 +17,19 @@
 #ifdef MOZ_B2G_RIL
 #include "nsIIccProvider.h"
 #endif // MOZ_B2G_RIL
 
 namespace mozilla {
 namespace dom {
 
 class MobileConnection final : public DOMEventTargetHelper
-                                 , private nsIMobileConnectionListener
+                             , private nsIMobileConnectionListener
 #ifdef MOZ_B2G_RIL
-                                 , private nsIIccListener
+                             , private nsIIccListener
 #endif // MOZ_B2G_RIL
 {
   /**
    * Class MobileConnection doesn't actually expose
    * nsIMobileConnectionListener. Instead, it owns an
    * nsIMobileConnectionListener derived instance mListener and passes it to
    * nsIMobileConnectionService. The onreceived events are first delivered to
    * mListener and then forwarded to its owner, MobileConnection. See also bug
--- a/dom/mobileconnection/MobileConnectionArray.h
+++ b/dom/mobileconnection/MobileConnectionArray.h
@@ -9,17 +9,17 @@
 
 #include "mozilla/dom/MobileConnection.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {
 
 class MobileConnectionArray final : public nsISupports
-                                      , public nsWrapperCache
+                                  , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MobileConnectionArray)
 
   explicit MobileConnectionArray(nsPIDOMWindow* aWindow);
 
   nsPIDOMWindow*
--- a/dom/mobileconnection/MobileConnectionInfo.h
+++ b/dom/mobileconnection/MobileConnectionInfo.h
@@ -13,17 +13,17 @@
 #include "nsIMobileConnectionInfo.h"
 #include "nsPIDOMWindow.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {
 
 class MobileConnectionInfo final : public nsIMobileConnectionInfo
-                                     , public nsWrapperCache
+                                 , public nsWrapperCache
 {
 public:
   NS_DECL_NSIMOBILECONNECTIONINFO
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MobileConnectionInfo)
 
   explicit MobileConnectionInfo(nsPIDOMWindow* aWindow);
 
--- a/dom/mobileconnection/MobileNetworkInfo.h
+++ b/dom/mobileconnection/MobileNetworkInfo.h
@@ -13,17 +13,17 @@
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {
 
 class GlobalObject;
 
 class MobileNetworkInfo final : public nsIMobileNetworkInfo
-                                  , public nsWrapperCache
+                              , public nsWrapperCache
 {
 public:
   NS_DECL_NSIMOBILENETWORKINFO
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MobileNetworkInfo)
 
   explicit MobileNetworkInfo(nsPIDOMWindow* aWindow);
 
--- a/dom/mobileconnection/ipc/MobileConnectionChild.h
+++ b/dom/mobileconnection/ipc/MobileConnectionChild.h
@@ -21,17 +21,17 @@ namespace mobileconnection {
 
 /**
  * Child actor of PMobileConnection. The object is created by
  * MobileConnectionIPCService and destroyed after MobileConnectionIPCService is
  * shutdown. For multi-sim device, more than one instance will
  * be created and each instance represents a sim slot.
  */
 class MobileConnectionChild final : public PMobileConnectionChild
-                                      , public nsIMobileConnection
+                                  , public nsIMobileConnection
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIMOBILECONNECTION
 
   explicit MobileConnectionChild(uint32_t aServiceId);
 
   void
--- a/dom/mobilemessage/MobileMessageManager.h
+++ b/dom/mobilemessage/MobileMessageManager.h
@@ -21,17 +21,17 @@ class DOMRequest;
 class DOMCursor;
 struct MmsParameters;
 struct MmsSendParameters;
 struct MobileMessageFilter;
 class OwningLongOrMozSmsMessageOrMozMmsMessage;
 struct SmsSendParameters;
 
 class MobileMessageManager final : public DOMEventTargetHelper
-                                     , public nsIObserver
+                                 , public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIOBSERVER
 
   NS_REALLY_FORWARD_NSIDOMEVENTTARGET(DOMEventTargetHelper)
 
   explicit MobileMessageManager(nsPIDOMWindow* aWindow);
--- a/dom/mobilemessage/ipc/SmsIPCService.h
+++ b/dom/mobilemessage/ipc/SmsIPCService.h
@@ -14,19 +14,19 @@
 
 namespace mozilla {
 namespace dom {
 namespace mobilemessage {
 
 class PSmsChild;
 
 class SmsIPCService final : public nsISmsService
-                              , public nsIMmsService
-                              , public nsIMobileMessageDatabaseService
-                              , public nsIObserver
+                          , public nsIMmsService
+                          , public nsIMobileMessageDatabaseService
+                          , public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISMSSERVICE
   NS_DECL_NSIMMSSERVICE
   NS_DECL_NSIMOBILEMESSAGEDATABASESERVICE
   NS_DECL_NSIOBSERVER
 
--- a/dom/network/Connection.h
+++ b/dom/network/Connection.h
@@ -18,18 +18,18 @@ namespace mozilla {
 namespace hal {
 class NetworkInformation;
 } // namespace hal
 
 namespace dom {
 namespace network {
 
 class Connection final : public DOMEventTargetHelper
-                           , public NetworkObserver
-                           , public nsINetworkProperties
+                       , public NetworkObserver
+                       , public nsINetworkProperties
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSINETWORKPROPERTIES
 
   NS_REALLY_FORWARD_NSIDOMEVENTTARGET(DOMEventTargetHelper)
 
   explicit Connection(nsPIDOMWindow *aWindow);
--- a/dom/network/UDPSocket.h
+++ b/dom/network/UDPSocket.h
@@ -20,18 +20,18 @@ struct JSContext;
 
 namespace mozilla {
 namespace dom {
 
 struct UDPOptions;
 class StringOrBlobOrArrayBufferOrArrayBufferView;
 
 class UDPSocket final : public DOMEventTargetHelper
-                          , public nsIUDPSocketListener
-                          , public nsIUDPSocketInternal
+                      , public nsIUDPSocketListener
+                      , public nsIUDPSocketInternal
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_CYCLE_COLLECTION_CLASS_INHERITED(UDPSocket, DOMEventTargetHelper)
   NS_DECL_NSIUDPSOCKETLISTENER
   NS_DECL_NSIUDPSOCKETINTERNAL
   NS_REALLY_FORWARD_NSIDOMEVENTTARGET(DOMEventTargetHelper)
 
--- a/dom/nfc/MozNDEFRecord.h
+++ b/dom/nfc/MozNDEFRecord.h
@@ -26,17 +26,17 @@ struct JSContext;
 struct JSStructuredCloneWriter;
 
 namespace mozilla {
 namespace dom {
 
 class MozNDEFRecordOptions;
 
 class MozNDEFRecord final : public nsISupports,
-                                public nsWrapperCache
+                            public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MozNDEFRecord)
 
 public:
   MozNDEFRecord(nsISupports* aParent, TNF aTnf = TNF::Empty);
 
--- a/dom/nfc/gonk/NfcService.h
+++ b/dom/nfc/gonk/NfcService.h
@@ -14,17 +14,17 @@
 class nsIThread;
 
 namespace mozilla {
 namespace dom {
 class NfcEventOptions;
 } // namespace dom
 
 class NfcService final : public nsINfcService,
-                             public mozilla::ipc::NfcSocketListener
+                         public mozilla::ipc::NfcSocketListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSINFCSERVICE
 
   static already_AddRefed<NfcService> FactoryCreate();
 
   void DispatchNfcEvent(const mozilla::dom::NfcEventOptions& aOptions);
--- a/dom/notification/DesktopNotification.h
+++ b/dom/notification/DesktopNotification.h
@@ -30,17 +30,17 @@ namespace dom {
 class AlertServiceObserver;
 class DesktopNotification;
 
 /*
  * DesktopNotificationCenter
  * Object hangs off of the navigator object and hands out DesktopNotification objects
  */
 class DesktopNotificationCenter final : public nsISupports,
-                                            public nsWrapperCache
+                                        public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DesktopNotificationCenter)
 
   explicit DesktopNotificationCenter(nsPIDOMWindow* aWindow)
   {
     MOZ_ASSERT(aWindow);
--- a/dom/offline/nsDOMOfflineResourceList.h
+++ b/dom/offline/nsDOMOfflineResourceList.h
@@ -30,20 +30,20 @@ class nsIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 class DOMStringList;
 } // namespace dom
 } // namespace mozilla
 
 class nsDOMOfflineResourceList final : public mozilla::DOMEventTargetHelper,
-                                           public nsIDOMOfflineResourceList,
-                                           public nsIObserver,
-                                           public nsIOfflineCacheUpdateObserver,
-                                           public nsSupportsWeakReference
+                                       public nsIDOMOfflineResourceList,
+                                       public nsIObserver,
+                                       public nsIOfflineCacheUpdateObserver,
+                                       public nsSupportsWeakReference
 {
   typedef mozilla::ErrorResult ErrorResult;
 
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSIDOMOFFLINERESOURCELIST
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIOFFLINECACHEUPDATEOBSERVER
--- a/dom/plugins/base/nsPluginHost.h
+++ b/dom/plugins/base/nsPluginHost.h
@@ -66,19 +66,19 @@ public:
   int64_t     mLastModifiedTime;
   bool        mSeen;
 
   nsRefPtr<nsInvalidPluginTag> mPrev;
   nsRefPtr<nsInvalidPluginTag> mNext;
 };
 
 class nsPluginHost final : public nsIPluginHost,
-                               public nsIObserver,
-                               public nsITimerCallback,
-                               public nsSupportsWeakReference
+                           public nsIObserver,
+                           public nsITimerCallback,
+                           public nsSupportsWeakReference
 {
   friend class nsPluginTag;
   virtual ~nsPluginHost();
 
 public:
   nsPluginHost();
 
   static already_AddRefed<nsPluginHost> GetInst();
--- a/dom/plugins/base/nsPluginInstanceOwner.h
+++ b/dom/plugins/base/nsPluginInstanceOwner.h
@@ -45,19 +45,19 @@ class gfxXlibSurface;
 #ifdef MOZ_WIDGET_QT
 #include "gfxQtNativeRenderer.h"
 #else
 #include "gfxXlibNativeRenderer.h"
 #endif
 #endif
 
 class nsPluginInstanceOwner final : public nsIPluginInstanceOwner,
-                                        public nsIDOMEventListener,
-                                        public nsIPrivacyTransitionObserver,
-                                        public nsSupportsWeakReference
+                                    public nsIDOMEventListener,
+                                    public nsIPrivacyTransitionObserver,
+                                    public nsSupportsWeakReference
 {
 public:
   nsPluginInstanceOwner();
   
   NS_DECL_ISUPPORTS
   NS_DECL_NSIPLUGININSTANCEOWNER
   NS_DECL_NSIPRIVACYTRANSITIONOBSERVER
   
--- a/dom/plugins/ipc/PluginModuleParent.cpp
+++ b/dom/plugins/ipc/PluginModuleParent.cpp
@@ -2896,17 +2896,17 @@ PluginModuleChromeParent::OnCrash(DWORD 
         KillProcess(OtherProcess(), 1, false);
     }
 }
 
 #endif // MOZ_CRASHREPORTER_INJECTOR
 
 #ifdef MOZ_ENABLE_PROFILER_SPS
 class PluginProfilerObserver final : public nsIObserver,
-                                         public nsSupportsWeakReference
+                                     public nsSupportsWeakReference
 {
 public:
     NS_DECL_ISUPPORTS
     NS_DECL_NSIOBSERVER
 
     explicit PluginProfilerObserver(PluginModuleParent* pmp)
       : mPmp(pmp)
     {}
--- a/dom/power/PowerManager.h
+++ b/dom/power/PowerManager.h
@@ -17,17 +17,17 @@
 class nsPIDOMWindow;
 
 namespace mozilla {
 class ErrorResult;
 
 namespace dom {
 
 class PowerManager final : public nsIDOMMozWakeLockListener
-                             , public nsWrapperCache
+                         , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(PowerManager)
   NS_DECL_NSIDOMMOZWAKELOCKLISTENER
 
   nsresult Init(nsIDOMWindow *aWindow);
   nsresult Shutdown();
--- a/dom/presentation/PresentationDeviceManager.h
+++ b/dom/presentation/PresentationDeviceManager.h
@@ -11,19 +11,19 @@
 #include "nsIPresentationDeviceManager.h"
 #include "nsIPresentationDeviceProvider.h"
 #include "nsCOMArray.h"
 
 namespace mozilla {
 namespace dom {
 
 class PresentationDeviceManager final : public nsIPresentationDeviceManager
-                                          , public nsIPresentationDeviceListener
-                                          , public nsIPresentationDeviceEventListener
-                                          , public nsIObserver
+                                      , public nsIPresentationDeviceListener
+                                      , public nsIPresentationDeviceEventListener
+                                      , public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIPRESENTATIONDEVICEMANAGER
   NS_DECL_NSIPRESENTATIONDEVICELISTENER
   NS_DECL_NSIPRESENTATIONDEVICEEVENTLISTENER
   NS_DECL_NSIOBSERVER
 
--- a/dom/quota/QuotaManager.cpp
+++ b/dom/quota/QuotaManager.cpp
@@ -258,18 +258,18 @@ private:
 // certain origin. Created when nsIQuotaManager::GetUsageForURI is called.
 // May be canceled with nsIQuotaRequest::Cancel. Runs three times, first
 // on the main thread, next on the IO thread, and then finally again on the main
 // thread. While on the IO thread the runnable will calculate the size of all
 // files in the origin's directory before dispatching itself back to the main
 // thread. When on the main thread the runnable will call the callback and then
 // notify the QuotaManager that the job has been completed.
 class AsyncUsageRunnable final : public UsageInfo,
-                                     public nsRunnable,
-                                     public nsIQuotaRequest
+                                 public nsRunnable,
+                                 public nsIQuotaRequest
 {
   enum CallbackState {
     // Not yet run.
     Pending = 0,
 
     // Running on the main thread in the callback for OpenAllowed.
     OpenAllowed,
 
--- a/dom/quota/QuotaManager.h
+++ b/dom/quota/QuotaManager.h
@@ -64,17 +64,17 @@ struct OriginParams
   { }
 
   nsCString mOrigin;
   PersistenceType mPersistenceType;
   bool mIsApp;
 };
 
 class QuotaManager final : public nsIQuotaManager,
-                               public nsIObserver
+                           public nsIObserver
 {
   friend class AsyncUsageRunnable;
   friend class CollectOriginsHelper;
   friend class FinalizeOriginEvictionRunnable;
   friend class GroupInfo;
   friend class OriginClearRunnable;
   friend class OriginInfo;
   friend class QuotaObject;
--- a/dom/quota/nsIOfflineStorage.h
+++ b/dom/quota/nsIOfflineStorage.h
@@ -81,26 +81,26 @@ protected:
   PersistenceType mPersistenceType;
   nsCString mGroup;
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsIOfflineStorage, NS_OFFLINESTORAGE_IID)
 
 #define NS_DECL_NSIOFFLINESTORAGE                                              \
   NS_IMETHOD_(const nsACString&)                                               \
-  Id() override;                                                           \
+  Id() override;                                                               \
                                                                                \
   NS_IMETHOD_(Client*)                                                         \
-  GetClient() override;                                                    \
+  GetClient() override;                                                        \
                                                                                \
   NS_IMETHOD_(bool)                                                            \
-  IsOwnedByProcess(ContentParent* aOwner) override;                        \
+  IsOwnedByProcess(ContentParent* aOwner) override;                            \
                                                                                \
   NS_IMETHOD_(const nsACString&)                                               \
-  Origin() override;                                                       \
+  Origin() override;                                                           \
                                                                                \
   NS_IMETHOD_(nsresult)                                                        \
-  Close() override;                                                        \
+  Close() override;                                                            \
                                                                                \
   NS_IMETHOD_(void)                                                            \
   Invalidate() override;
 
 #endif // nsIOfflineStorage_h__
--- a/dom/requestsync/RequestSyncWifiService.h
+++ b/dom/requestsync/RequestSyncWifiService.h
@@ -10,17 +10,17 @@
 #include "mozilla/dom/network/Types.h"
 #include "mozilla/Hal.h"
 #include "nsIObserver.h"
 
 namespace mozilla {
 namespace dom {
 
 class RequestSyncWifiService final : public nsISupports
-                                       , public NetworkObserver
+                                   , public NetworkObserver
 {
 public:
   NS_DECL_ISUPPORTS
 
   static void Init();
 
   static already_AddRefed<RequestSyncWifiService> GetInstance();
 
--- a/dom/security/nsCORSListenerProxy.cpp
+++ b/dom/security/nsCORSListenerProxy.cpp
@@ -912,18 +912,18 @@ nsCORSListenerProxy::UpdateChannel(nsICh
 }
 
 //////////////////////////////////////////////////////////////////////////
 // Preflight proxy
 
 // Class used as streamlistener and notification callback when
 // doing the initial OPTIONS request for a CORS check
 class nsCORSPreflightListener final : public nsIStreamListener,
-                                          public nsIInterfaceRequestor,
-                                          public nsIChannelEventSink
+                                      public nsIInterfaceRequestor,
+                                      public nsIChannelEventSink
 {
 public:
   nsCORSPreflightListener(nsIChannel* aOuterChannel,
                           nsIStreamListener* aOuterListener,
                           nsISupports* aOuterContext,
                           nsIPrincipal* aReferrerPrincipal,
                           const nsACString& aRequestMethod,
                           bool aWithCredentials)
--- a/dom/security/nsCORSListenerProxy.h
+++ b/dom/security/nsCORSListenerProxy.h
@@ -25,19 +25,19 @@ nsresult
 NS_StartCORSPreflight(nsIChannel* aRequestChannel,
                       nsIStreamListener* aListener,
                       nsIPrincipal* aPrincipal,
                       bool aWithCredentials,
                       nsTArray<nsCString>& aACUnsafeHeaders,
                       nsIChannel** aPreflightChannel);
 
 class nsCORSListenerProxy final : public nsIStreamListener,
-                                      public nsIInterfaceRequestor,
-                                      public nsIChannelEventSink,
-                                      public nsIAsyncVerifyRedirectCallback
+                                  public nsIInterfaceRequestor,
+                                  public nsIChannelEventSink,
+                                  public nsIAsyncVerifyRedirectCallback
 {
 public:
   nsCORSListenerProxy(nsIStreamListener* aOuter,
                       nsIPrincipal* aRequestingPrincipal,
                       bool aWithCredentials);
   nsCORSListenerProxy(nsIStreamListener* aOuter,
                       nsIPrincipal* aRequestingPrincipal,
                       bool aWithCredentials,
--- a/dom/security/nsCSPContext.h
+++ b/dom/security/nsCSPContext.h
@@ -94,17 +94,17 @@ class CSPViolationReportListener : publi
   protected:
     virtual ~CSPViolationReportListener();
 };
 
 // The POST of the violation report (if it happens) should not follow
 // redirects, per the spec. hence, we implement an nsIChannelEventSink
 // with an object so we can tell XHR to abort if a redirect happens.
 class CSPReportRedirectSink final : public nsIChannelEventSink,
-                                        public nsIInterfaceRequestor
+                                    public nsIInterfaceRequestor
 {
   public:
     NS_DECL_NSICHANNELEVENTSINK
     NS_DECL_NSIINTERFACEREQUESTOR
     NS_DECL_ISUPPORTS
 
   public:
     CSPReportRedirectSink();
--- a/dom/smil/TimeEvent.h
+++ b/dom/smil/TimeEvent.h
@@ -9,17 +9,17 @@
 #include "mozilla/dom/Event.h"
 #include "mozilla/dom/TimeEventBinding.h"
 #include "nsIDOMTimeEvent.h"
 
 namespace mozilla {
 namespace dom {
 
 class TimeEvent final : public Event,
-                            public nsIDOMTimeEvent
+                        public nsIDOMTimeEvent
 {
 public:
   TimeEvent(EventTarget* aOwner,
             nsPresContext* aPresContext,
             InternalSMILTimeEvent* aEvent);
 
   // nsISupports interface:
   NS_DECL_ISUPPORTS_INHERITED
--- a/dom/smil/nsSMILAnimationController.h
+++ b/dom/smil/nsSMILAnimationController.h
@@ -37,17 +37,17 @@ class SVGAnimationElement;
 // be performed at a document-level.
 //
 // The animation controller can contain many child time containers (timed
 // document root objects) which may correspond to SVG document fragments within
 // a compound document. These time containers can be paused individually or
 // here, at the document level.
 //
 class nsSMILAnimationController final : public nsSMILTimeContainer,
-                                            public nsARefreshObserver
+                                        public nsARefreshObserver
 {
 public:
   explicit nsSMILAnimationController(nsIDocument* aDoc);
 
   // Clears mDocument pointer. (Called by our nsIDocument when it's going away)
   void Disconnect();
 
   // nsSMILContainer
--- a/dom/storage/DOMStorageIPC.h
+++ b/dom/storage/DOMStorageIPC.h
@@ -18,17 +18,17 @@ namespace dom {
 
 class DOMLocalStorageManager;
 
 // Child side of the IPC protocol, exposes as DB interface but
 // is responsible to send all requests to the parent process
 // and expects asynchronous answers. Those are then transparently
 // forwarded back to consumers on the child process.
 class DOMStorageDBChild final : public DOMStorageDBBridge
-                                  , public PStorageChild
+                              , public PStorageChild
 {
   virtual ~DOMStorageDBChild();
 
 public:
   explicit DOMStorageDBChild(DOMLocalStorageManager* aManager);
 
   NS_IMETHOD_(MozExternalRefCountType) AddRef(void);
   NS_IMETHOD_(MozExternalRefCountType) Release(void);
@@ -102,17 +102,17 @@ private:
 
 
 // Receives async requests from child processes and is responsible
 // to send back responses from the DB thread.  Exposes as a fake
 // DOMStorageCache consumer.
 // Also responsible for forwardning all chrome operation notifications
 // such as cookie cleaning etc to the child process.
 class DOMStorageDBParent final : public PStorageParent
-                                   , public DOMStorageObserverSink
+                               , public DOMStorageObserverSink
 {
   virtual ~DOMStorageDBParent();
 
 public:
   DOMStorageDBParent();
 
   virtual mozilla::ipc::IProtocol*
   CloneProtocol(Channel* aChannel,
--- a/dom/svg/DOMSVGAnimatedNumberList.h
+++ b/dom/svg/DOMSVGAnimatedNumberList.h
@@ -30,17 +30,17 @@ class SVGNumberList;
  * and will go a long way to helping you understand the architecture here.
  *
  * This class is strongly intertwined with DOMSVGNumberList and DOMSVGNumber.
  * Our DOMSVGNumberList base and anim vals are friends and take care of nulling
  * out our pointers to them when they die (making our pointers to them true
  * weak refs).
  */
 class DOMSVGAnimatedNumberList final : public nsISupports,
-                                           public nsWrapperCache
+                                       public nsWrapperCache
 {
   friend class DOMSVGNumberList;
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMSVGAnimatedNumberList)
 
   /**
--- a/dom/svg/DOMSVGLength.h
+++ b/dom/svg/DOMSVGLength.h
@@ -70,17 +70,17 @@ class ErrorResult;
  *
  * To use these classes for <length> attributes as well as <list-of-length>
  * attributes, we would need to take a bit from mListIndex and use that to
  * indicate whether the object belongs to a list or non-list attribute, then
  * if-else as appropriate. The bug for doing that work is:
  * https://bugzilla.mozilla.org/show_bug.cgi?id=571734
  */
 class DOMSVGLength final : public nsIDOMSVGLength,
-                               public nsWrapperCache
+                           public nsWrapperCache
 {
   friend class AutoChangeLengthNotifier;
 
   /**
    * Ctor for creating the object returned by nsSVGLength2::ToDOMBaseVal/ToDOMAnimVal
    */
   DOMSVGLength(nsSVGLength2* aVal, nsSVGElement* aSVGElement, bool aAnimVal);
 
--- a/dom/svg/DOMSVGLengthList.h
+++ b/dom/svg/DOMSVGLengthList.h
@@ -34,17 +34,17 @@ class DOMSVGLength;
  * responsible for nulling out our DOMSVGAnimatedLengthList's pointer to us
  * when we die, essentially making its pointer to us a weak pointer. Similarly,
  * our DOMSVGLength items are friends of us and responsible for nulling out our
  * pointers to them.
  *
  * Our DOM items are created lazily on demand as and when script requests them.
  */
 class DOMSVGLengthList final : public nsISupports,
-                                   public nsWrapperCache
+                               public nsWrapperCache
 {
   friend class AutoChangeLengthListNotifier;
   friend class DOMSVGLength;
 
   ~DOMSVGLengthList() {
     // Our mAList's weak ref to us must be nulled out when we die. If GC has
     // unlinked us using the cycle collector code, then that has already
     // happened, and mAList is null.
--- a/dom/svg/DOMSVGNumber.h
+++ b/dom/svg/DOMSVGNumber.h
@@ -29,17 +29,17 @@ namespace mozilla {
  *
  * For the DOM wrapper classes for non-list SVGNumber, see nsSVGNumber2.h.
  *
  * See the architecture comment in DOMSVGAnimatedNumberList.h.
  *
  * See the comment in DOMSVGLength.h (yes, LENGTH), which applies here too.
  */
 class DOMSVGNumber final : public nsISupports
-                             , public nsWrapperCache
+                         , public nsWrapperCache
 {
   friend class AutoChangeNumberNotifier;
 
   ~DOMSVGNumber() {
     // Our mList's weak ref to us must be nulled out when we die. If GC has
     // unlinked us using the cycle collector code, then that has already
     // happened, and mList is null.
     if (mList) {
--- a/dom/svg/DOMSVGNumberList.h
+++ b/dom/svg/DOMSVGNumberList.h
@@ -34,17 +34,17 @@ class DOMSVGNumber;
  * responsible for nulling out our DOMSVGAnimatedNumberList's pointer to us
  * when we die, essentially making its pointer to us a weak pointer. Similarly,
  * our DOMSVGNumber items are friends of us and responsible for nulling out our
  * pointers to them.
  *
  * Our DOM items are created lazily on demand as and when script requests them.
  */
 class DOMSVGNumberList final : public nsISupports,
-                                   public nsWrapperCache
+                               public nsWrapperCache
 {
   friend class AutoChangeNumberListNotifier;
   friend class DOMSVGNumber;
 
   ~DOMSVGNumberList() {
     // Our mAList's weak ref to us must be nulled out when we die. If GC has
     // unlinked us using the cycle collector code, then that has already
     // happened, and mAList is null.
--- a/dom/svg/DOMSVGPathSeg.h
+++ b/dom/svg/DOMSVGPathSeg.h
@@ -37,35 +37,35 @@ namespace mozilla {
                          uint32_t aListIndex,                                 \
                          bool aIsAnimValItem)                                 \
     : DOMSVGPathSeg(aList, aListIndex, aIsAnimValItem)                        \
   {                                                                           \
     CHECK_ARG_COUNT_IN_SYNC(segType);                                         \
   }                                                                           \
   /* From DOMSVGPathSeg: */                                                   \
   virtual uint32_t                                                            \
-  Type() const override                                                   \
+  Type() const override                                                       \
   {                                                                           \
     return segType;                                                           \
   }                                                                           \
   virtual DOMSVGPathSeg*                                                      \
-  Clone() override                                                        \
+  Clone() override                                                            \
   {                                                                           \
     /* InternalItem() + 1, because we're skipping the encoded seg type */     \
     float *args = IsInList() ? InternalItem() + 1 : mArgs;                    \
     return new DOMSVGPathSeg##segName(args);                                  \
   }                                                                           \
   virtual float*                                                              \
-  PtrToMemberArgs() override                                              \
+  PtrToMemberArgs() override                                                  \
   {                                                                           \
     return mArgs;                                                             \
   }                                                                           \
                                                                               \
   virtual JSObject*                                                           \
-  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override  \
+  WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) override      \
   {                                                                           \
     return dom::SVGPathSeg##segName##Binding::Wrap(aCx, this, aGivenProto);   \
   }
 
 
 /**
  * Class DOMSVGPathSeg
  *
--- a/dom/svg/DOMSVGPathSegList.h
+++ b/dom/svg/DOMSVGPathSegList.h
@@ -42,17 +42,17 @@ class SVGAnimatedPathSegList;
  *
  * This class is strongly intertwined with DOMSVGPathSeg. Our DOMSVGPathSeg
  * items are friends of us and responsible for nulling out our pointers to
  * them when they die.
  *
  * Our DOM items are created lazily on demand as and when script requests them.
  */
 class DOMSVGPathSegList final : public nsISupports,
-                                    public nsWrapperCache
+                                public nsWrapperCache
 {
   friend class AutoChangePathSegListNotifier;
   friend class DOMSVGPathSeg;
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMSVGPathSegList)
 
--- a/dom/svg/DOMSVGPointList.h
+++ b/dom/svg/DOMSVGPointList.h
@@ -43,17 +43,17 @@ class SVGAnimatedPointList;
  *
  * This class is strongly intertwined with DOMSVGPoint. Our DOMSVGPoint
  * items are friends of us and responsible for nulling out our pointers to
  * them when they die.
  *
  * Our DOM items are created lazily on demand as and when script requests them.
  */
 class DOMSVGPointList final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
   friend class AutoChangePointListNotifier;
   friend class nsISVGPoint;
   friend class mozilla::DOMSVGPoint;
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMSVGPointList)
--- a/dom/svg/DOMSVGStringList.h
+++ b/dom/svg/DOMSVGStringList.h
@@ -39,17 +39,17 @@ class SVGStringList;
  * DOMSVGString items to maintain. As far as script is concerned, objects
  * of this class contain a list of strings, not a list of mutable objects
  * like the other SVG list types. As a result, unlike the other SVG list
  * types, this class does not create its items lazily on demand and store
  * them so it can return the same objects each time. It simply returns a new
  * string each time any given item is requested.
  */
 class DOMSVGStringList final : public nsISupports
-                                 , public nsWrapperCache
+                             , public nsWrapperCache
 {
   friend class AutoChangeStringListNotifier;
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMSVGStringList)
 
   nsSVGElement* GetParentObject() const
--- a/dom/svg/DOMSVGTransformList.h
+++ b/dom/svg/DOMSVGTransformList.h
@@ -29,17 +29,17 @@ class SVGTransform;
  * Class DOMSVGTransformList
  *
  * This class is used to create the DOM tearoff objects that wrap internal
  * SVGTransformList objects.
  *
  * See the architecture comment in SVGAnimatedTransformList.h.
  */
 class DOMSVGTransformList final : public nsISupports,
-                                      public nsWrapperCache
+                                  public nsWrapperCache
 {
   friend class AutoChangeTransformListNotifier;
   friend class dom::SVGTransform;
 
   ~DOMSVGTransformList() {
     // Our mAList's weak ref to us must be nulled out when we die. If GC has
     // unlinked us using the cycle collector code, then that has already
     // happened, and mAList is null.
--- a/dom/svg/SVGAElement.h
+++ b/dom/svg/SVGAElement.h
@@ -18,17 +18,17 @@ namespace mozilla {
 class EventChainPostVisitor;
 class EventChainPreVisitor;
 
 namespace dom {
 
 typedef SVGGraphicsElement SVGAElementBase;
 
 class SVGAElement final : public SVGAElementBase,
-                              public Link
+                          public Link
 {
 protected:
   explicit SVGAElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
   friend nsresult (::NS_NewSVGAElement(nsIContent **aResult,
                                        already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
   virtual JSObject* WrapNode(JSContext *cx, JS::Handle<JSObject*> aGivenProto) override;
 
 public:
--- a/dom/svg/SVGAnimatedPreserveAspectRatio.h
+++ b/dom/svg/SVGAnimatedPreserveAspectRatio.h
@@ -107,17 +107,17 @@ public:
     virtual nsSMILValue GetBaseValue() const override;
     virtual void ClearAnimValue() override;
     virtual nsresult SetAnimValue(const nsSMILValue& aValue) override;
   };
 };
 
 namespace dom {
 class DOMSVGAnimatedPreserveAspectRatio final : public nsISupports,
-                                                    public nsWrapperCache
+                                                public nsWrapperCache
 {
   ~DOMSVGAnimatedPreserveAspectRatio();
 
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMSVGAnimatedPreserveAspectRatio)
 
   DOMSVGAnimatedPreserveAspectRatio(SVGAnimatedPreserveAspectRatio* aVal,
                                     nsSVGElement *aSVGElement)
--- a/dom/svg/SVGMPathElement.h
+++ b/dom/svg/SVGMPathElement.h
@@ -16,17 +16,17 @@ nsresult NS_NewSVGMPathElement(nsIConten
 
 typedef nsSVGElement SVGMPathElementBase;
 
 namespace mozilla {
 namespace dom {
 class SVGPathElement;
 
 class SVGMPathElement final : public SVGMPathElementBase,
-                                  public nsStubMutationObserver
+                              public nsStubMutationObserver
 {
 protected:
   friend nsresult (::NS_NewSVGMPathElement(nsIContent **aResult,
                                            already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
   explicit SVGMPathElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
   ~SVGMPathElement();
 
   virtual JSObject* WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) override;
--- a/dom/svg/SVGPreserveAspectRatio.h
+++ b/dom/svg/SVGPreserveAspectRatio.h
@@ -108,17 +108,17 @@ private:
   uint8_t mAlign;
   uint8_t mMeetOrSlice;
   bool mDefer;
 };
 
 namespace dom {
 
 class DOMSVGPreserveAspectRatio final : public nsISupports,
-                                            public nsWrapperCache
+                                        public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(DOMSVGPreserveAspectRatio)
 
   DOMSVGPreserveAspectRatio(SVGAnimatedPreserveAspectRatio* aVal,
                             nsSVGElement *aSVGElement,
                             bool aIsBaseValue)
--- a/dom/svg/SVGScriptElement.h
+++ b/dom/svg/SVGScriptElement.h
@@ -19,17 +19,17 @@ nsresult NS_NewSVGScriptElement(nsIConte
                                 mozilla::dom::FromParser aFromParser);
 
 namespace mozilla {
 namespace dom {
 
 typedef nsSVGElement SVGScriptElementBase;
 
 class SVGScriptElement final : public SVGScriptElementBase,
-                                   public nsScriptElement
+                               public nsScriptElement
 {
 protected:
   friend nsresult (::NS_NewSVGScriptElement(nsIContent **aResult,
                                             already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo,
                                             mozilla::dom::FromParser aFromParser));
   SVGScriptElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo,
                    FromParser aFromParser);
 
--- a/dom/svg/SVGStyleElement.h
+++ b/dom/svg/SVGStyleElement.h
@@ -15,18 +15,18 @@ nsresult NS_NewSVGStyleElement(nsIConten
                                already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
 typedef nsSVGElement SVGStyleElementBase;
 
 namespace mozilla {
 namespace dom {
 
 class SVGStyleElement final : public SVGStyleElementBase,
-                                  public nsStyleLinkElement,
-                                  public nsStubMutationObserver
+                              public nsStyleLinkElement,
+                              public nsStubMutationObserver
 {
 protected:
   friend nsresult (::NS_NewSVGStyleElement(nsIContent **aResult,
                                            already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
   explicit SVGStyleElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
   ~SVGStyleElement();
 
   virtual JSObject* WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) override;
--- a/dom/svg/SVGSymbolElement.h
+++ b/dom/svg/SVGSymbolElement.h
@@ -15,17 +15,17 @@ nsresult NS_NewSVGSymbolElement(nsIConte
                                 already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
 namespace mozilla {
 namespace dom {
 
 typedef nsSVGElement SVGSymbolElementBase;
 
 class SVGSymbolElement final : public SVGSymbolElementBase,
-                                   public SVGTests
+                               public SVGTests
 {
 protected:
   friend nsresult (::NS_NewSVGSymbolElement(nsIContent **aResult,
                                             already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
   explicit SVGSymbolElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
   ~SVGSymbolElement();
   virtual JSObject* WrapNode(JSContext *cx, JS::Handle<JSObject*> aGivenProto) override;
 
--- a/dom/svg/SVGTitleElement.h
+++ b/dom/svg/SVGTitleElement.h
@@ -13,17 +13,17 @@
 typedef nsSVGElement SVGTitleElementBase;
 
 nsresult NS_NewSVGTitleElement(nsIContent **aResult,
                                already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 namespace mozilla {
 namespace dom {
 
 class SVGTitleElement final : public SVGTitleElementBase,
-                                  public nsStubMutationObserver
+                              public nsStubMutationObserver
 {
 protected:
   friend nsresult (::NS_NewSVGTitleElement(nsIContent **aResult,
                                            already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
   explicit SVGTitleElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
   ~SVGTitleElement();
 
   virtual JSObject* WrapNode(JSContext *aCx, JS::Handle<JSObject*> aGivenProto) override;
--- a/dom/svg/SVGUseElement.h
+++ b/dom/svg/SVGUseElement.h
@@ -25,17 +25,17 @@ nsresult NS_NewSVGUseElement(nsIContent 
                              already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo);
 
 namespace mozilla {
 namespace dom {
 
 typedef SVGGraphicsElement SVGUseElementBase;
 
 class SVGUseElement final : public SVGUseElementBase,
-                                public nsStubMutationObserver
+                            public nsStubMutationObserver
 {
   friend class ::nsSVGUseFrame;
 protected:
   friend nsresult (::NS_NewSVGUseElement(nsIContent **aResult,
                                          already_AddRefed<mozilla::dom::NodeInfo>&& aNodeInfo));
   explicit SVGUseElement(already_AddRefed<mozilla::dom::NodeInfo>& aNodeInfo);
   virtual ~SVGUseElement();
   virtual JSObject* WrapNode(JSContext *cx, JS::Handle<JSObject*> aGivenProto) override;
--- a/dom/system/gonk/AudioManager.h
+++ b/dom/system/gonk/AudioManager.h
@@ -34,17 +34,17 @@ class SwitchEvent;
 typedef Observer<SwitchEvent> SwitchObserver;
 } // namespace hal
 
 namespace dom {
 namespace gonk {
 class RecoverTask;
 class AudioChannelVolInitCallback;
 class AudioManager final : public nsIAudioManager
-                             , public nsIObserver
+                         , public nsIObserver
 {
 public:
   static already_AddRefed<AudioManager> GetInstance();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSIAUDIOMANAGER
   NS_DECL_NSIOBSERVER
 
--- a/dom/system/gonk/SystemWorkerManager.h
+++ b/dom/system/gonk/SystemWorkerManager.h
@@ -32,18 +32,18 @@ namespace mozilla {
 namespace ipc {
   class KeyStore;
 }
 
 namespace dom {
 namespace gonk {
 
 class SystemWorkerManager final : public nsIObserver,
-                                      public nsIInterfaceRequestor,
-                                      public nsISystemWorkerManager
+                                  public nsIInterfaceRequestor,
+                                  public nsISystemWorkerManager
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIINTERFACEREQUESTOR
   NS_DECL_NSISYSTEMWORKERMANAGER
 
   nsresult Init();
--- a/dom/system/gonk/nsVolumeMountLock.h
+++ b/dom/system/gonk/nsVolumeMountLock.h
@@ -21,18 +21,18 @@ namespace system {
 
 /* The VolumeMountLock is designed so that it can be used in the Child or
  * Parent process. While the VolumeMountLock object exists, then the
  * VolumeManager/AutoMounter will prevent a mounted volume from being
  * shared with the PC.
  */
 
 class nsVolumeMountLock final : public nsIVolumeMountLock,
-                                    public nsIObserver,
-                                    public nsSupportsWeakReference
+                                public nsIObserver,
+                                public nsSupportsWeakReference
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIOBSERVER
   NS_DECL_NSIVOLUMEMOUNTLOCK
 
   static already_AddRefed<nsVolumeMountLock> Create(const nsAString& volumeName);
 
--- a/dom/system/gonk/nsVolumeService.h
+++ b/dom/system/gonk/nsVolumeService.h
@@ -27,17 +27,17 @@ class Volume;
 
 /***************************************************************************
 * The nsVolumeData class encapsulates the data that is updated/maintained
 * on the main thread in order to support the nsIVolume and nsIVolumeService
 * classes.
 */
 
 class nsVolumeService final : public nsIVolumeService,
-                                  public nsIDOMMozWakeLockListener
+                              public nsIDOMMozWakeLockListener
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIVOLUMESERVICE
   NS_DECL_NSIDOMMOZWAKELOCKLISTENER
 
   nsVolumeService();
 
--- a/dom/telephony/CallsList.h
+++ b/dom/telephony/CallsList.h
@@ -10,17 +10,17 @@
 #include "mozilla/dom/telephony/TelephonyCommon.h"
 
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {
 
 class CallsList final : public nsISupports,
-                            public nsWrapperCache
+                        public nsWrapperCache
 {
   nsRefPtr<Telephony> mTelephony;
   nsRefPtr<TelephonyCallGroup> mGroup;
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(CallsList)
 
--- a/dom/telephony/MMICall.h
+++ b/dom/telephony/MMICall.h
@@ -20,17 +20,17 @@
 
 struct JSContext;
 class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 
 class MMICall final : public nsISupports,
-                          public nsWrapperCache
+                      public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(MMICall)
 
   MMICall(nsPIDOMWindow* aWindow, const nsAString& aServiceCode);
 
   nsPIDOMWindow*
--- a/dom/telephony/Telephony.h
+++ b/dom/telephony/Telephony.h
@@ -26,17 +26,17 @@ namespace telephony {
 
 class TelephonyDialCallback;
 
 } // namespace telephony
 
 class OwningTelephonyCallOrTelephonyCallGroup;
 
 class Telephony final : public DOMEventTargetHelper,
-                            private nsITelephonyListener
+                        private nsITelephonyListener
 {
   /**
    * Class Telephony doesn't actually expose nsITelephonyListener.
    * Instead, it owns an nsITelephonyListener derived instance mListener
    * and passes it to nsITelephonyService. The onreceived events are first
    * delivered to mListener and then forwarded to its owner, Telephony. See
    * also bug 775997 comment #51.
    */
--- a/dom/telephony/TelephonyCallId.h
+++ b/dom/telephony/TelephonyCallId.h
@@ -13,17 +13,17 @@
 #include "nsWrapperCache.h"
 
 class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 
 class TelephonyCallId final : public nsISupports,
-                                  public nsWrapperCache
+                              public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(TelephonyCallId)
 
   TelephonyCallId(nsPIDOMWindow* aWindow, const nsAString& aNumber,
                   uint16_t aNumberPresentation, const nsAString& aName,
                   uint16_t aNamePresentation);
--- a/dom/telephony/TelephonyDialCallback.h
+++ b/dom/telephony/TelephonyDialCallback.h
@@ -19,17 +19,17 @@
 
 class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 namespace telephony {
 
 class TelephonyDialCallback final : public TelephonyCallback,
-                                        public nsITelephonyDialCallback
+                                    public nsITelephonyDialCallback
 {
 public:
   NS_DECL_ISUPPORTS_INHERITED
   NS_DECL_NSITELEPHONYDIALCALLBACK
 
   TelephonyDialCallback(nsPIDOMWindow* aWindow, Telephony* aTelephony,
                         Promise* aPromise);
 
--- a/dom/telephony/USSDSession.h
+++ b/dom/telephony/USSDSession.h
@@ -19,17 +19,17 @@
 #include "nsWrapperCache.h"
 
 struct JSContext;
 
 namespace mozilla {
 namespace dom {
 
 class USSDSession final : public nsISupports,
-                              public nsWrapperCache
+                          public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(USSDSession)
 
   USSDSession(nsPIDOMWindow* aWindow, nsITelephonyService* aService,
               uint32_t aServiceId);
 
--- a/dom/telephony/ipc/TelephonyIPCService.h
+++ b/dom/telephony/ipc/TelephonyIPCService.h
@@ -12,18 +12,18 @@
 #include "nsITelephonyService.h"
 
 BEGIN_TELEPHONY_NAMESPACE
 
 class IPCTelephonyRequest;
 class PTelephonyChild;
 
 class TelephonyIPCService final : public nsITelephonyService
-                                     , public nsITelephonyListener
-                                     , public nsIObserver
+                                , public nsITelephonyListener
+                                , public nsIObserver
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSITELEPHONYSERVICE
   NS_DECL_NSITELEPHONYLISTENER
   NS_DECL_NSIOBSERVER
 
   TelephonyIPCService();
--- a/dom/time/TimeManager.h
+++ b/dom/time/TimeManager.h
@@ -13,17 +13,17 @@
 namespace mozilla {
 namespace dom {
 
 class Date;
 
 namespace time {
 
 class TimeManager final : public nsISupports
-                            , public nsWrapperCache
+                        , public nsWrapperCache
 {
 public:
   static bool PrefEnabled(JSContext* aCx, JSObject* aGlobal)
   {
 #ifdef MOZ_TIME_MANAGER
     return true;
 #else
     return false;
--- a/dom/tv/TVProgram.h
+++ b/dom/tv/TVProgram.h
@@ -12,17 +12,17 @@
 class nsITVProgramData;
 
 namespace mozilla {
 namespace dom {
 
 class TVChannel;
 
 class TVProgram final : public nsISupports
-                          , public nsWrapperCache
+                      , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(TVProgram)
 
   TVProgram(nsISupports* aOwner,
             TVChannel* aChannel,
             nsITVProgramData* aData);
--- a/dom/voicemail/Voicemail.h
+++ b/dom/voicemail/Voicemail.h
@@ -18,17 +18,17 @@ struct JSContext;
 class nsPIDOMWindow;
 
 namespace mozilla {
 namespace dom {
 
 class VoicemailStatus;
 
 class Voicemail final : public DOMEventTargetHelper,
-                            private nsIVoicemailListener
+                        private nsIVoicemailListener
 {
   /**
    * Class Voicemail doesn't actually expose nsIVoicemailListener. Instead, it
    * owns an nsIVoicemailListener derived instance mListener and passes it to
    * nsIVoicemailService. The onreceived events are first delivered to
    * mListener and then forwarded to its owner, Voicemail. See also bug 775997
    * comment #51.
    */
--- a/dom/voicemail/VoicemailStatus.h
+++ b/dom/voicemail/VoicemailStatus.h
@@ -12,17 +12,17 @@
 #include "nsIVoicemailService.h" // For nsIVoicemailProvider.
 #include "nsString.h"
 #include "nsWrapperCache.h"
 
 namespace mozilla {
 namespace dom {
 
 class VoicemailStatus final : public nsISupports
-                                , public nsWrapperCache
+                            , public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(VoicemailStatus)
 
   VoicemailStatus(nsISupports* aParent,
                   nsIVoicemailProvider* aProvider);
 
--- a/dom/voicemail/ipc/VoicemailIPCService.h
+++ b/dom/voicemail/ipc/VoicemailIPCService.h
@@ -12,17 +12,17 @@
 #include "nsAutoPtr.h"
 #include "nsIVoicemailService.h"
 
 namespace mozilla {
 namespace dom {
 namespace voicemail {
 
 class VoicemailIPCService final : public PVoicemailChild
-                                    , public nsIVoicemailService
+                                , public nsIVoicemailService
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIVOICEMAILSERVICE
 
   VoicemailIPCService();
 
   bool
--- a/dom/voicemail/ipc/VoicemailParent.h
+++ b/dom/voicemail/ipc/VoicemailParent.h
@@ -14,17 +14,17 @@
 #include "nsIVoicemailService.h"
 #include "nsString.h"
 
 namespace mozilla {
 namespace dom {
 namespace voicemail {
 
 class VoicemailParent final : public PVoicemailParent
-                                , public nsIVoicemailListener
+                            , public nsIVoicemailListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIVOICEMAILLISTENER
 
   VoicemailParent() { MOZ_COUNT_CTOR(VoicemailParent); }
 
   bool
--- a/dom/wifi/WifiCertService.h
+++ b/dom/wifi/WifiCertService.h
@@ -11,17 +11,17 @@
 #include "nsNSSShutDown.h"
 #include "nsThread.h"
 #include "mozilla/dom/WifiOptionsBinding.h"
 
 namespace mozilla {
 namespace dom {
 
 class WifiCertService final : public nsIWifiCertService,
-                                  public nsNSSShutDownObject
+                              public nsNSSShutDownObject
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSIWIFICERTSERVICE
 
   static already_AddRefed<WifiCertService>
   FactoryCreate();
   void DispatchResult(const mozilla::dom::WifiCertServiceResultOptions& aOptions);
--- a/dom/workers/DataStore.h
+++ b/dom/workers/DataStore.h
@@ -94,17 +94,17 @@ protected:
   virtual ~WorkerDataStore() {}
 
 private:
   nsMainThreadPtrHandle<DataStore> mBackingStore;
   nsRefPtr<DataStoreChangeEventProxy> mEventProxy;
 };
 
 class DataStoreChangeEventProxy final : public nsIDOMEventListener
-                                          , public WorkerFeature
+                                      , public WorkerFeature
 {
 public:
   NS_DECL_THREADSAFE_ISUPPORTS
   NS_DECL_NSIDOMEVENTLISTENER
 
   DataStoreChangeEventProxy(WorkerPrivate* aWorkerPrivate,
                             WorkerDataStore* aWorkerStore);
 
--- a/dom/workers/ScriptLoader.cpp
+++ b/dom/workers/ScriptLoader.cpp
@@ -217,18 +217,18 @@ private:
 
   void
   ShutdownScriptLoader(JSContext* aCx,
                        WorkerPrivate* aWorkerPrivate,
                        bool aResult);
 };
 
 class ScriptLoaderRunnable final : public WorkerFeature,
-                                       public nsIRunnable,
-                                       public nsIStreamLoaderObserver
+                                   public nsIRunnable,
+                                   public nsIStreamLoaderObserver
 {
   friend class ScriptExecutorRunnable;
 
   WorkerPrivate* mWorkerPrivate;
   nsCOMPtr<nsIEventTarget> mSyncLoopTarget;
   nsTArray<ScriptLoadInfo> mLoadInfos;
   bool mIsMainScript;
   WorkerScriptType mWorkerScriptType;
--- a/dom/workers/ServiceWorkerClients.h
+++ b/dom/workers/ServiceWorkerClients.h
@@ -15,17 +15,17 @@
 #include "mozilla/dom/ClientsBinding.h"
 #include "mozilla/ErrorResult.h"
 
 namespace mozilla {
 namespace dom {
 namespace workers {
 
 class ServiceWorkerClients final : public nsISupports,
-                                       public nsWrapperCache
+                                   public nsWrapperCache
 {
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_SCRIPT_HOLDER_CLASS(ServiceWorkerClients)
 
   explicit ServiceWorkerClients(ServiceWorkerGlobalScope* aWorkerScope);
 
   already_AddRefed<Promise>
--- a/dom/workers/ServiceWorkerManager.cpp
+++ b/dom/workers/ServiceWorkerManager.cpp
@@ -479,17 +479,17 @@ GetRequiredScopeStringPrefix(const nsACS
   }
 
   aPrefix.Append(dir);
   return NS_OK;
 }
 } // anonymous namespace
 
 class ServiceWorkerRegisterJob final : public ServiceWorkerJob,
-                                           public nsIStreamLoaderObserver
+                                       public nsIStreamLoaderObserver
 {
   friend class ContinueInstallTask;
 
   nsCString mScope;
   nsCString mScriptSpec;
   nsRefPtr<ServiceWorkerRegistrationInfo> mRegistration;
   nsRefPtr<ServiceWorkerUpdateFinishCallback> mCallback;
   nsCOMPtr<nsIPrincipal> mPrincipal;
--- a/dom/workers/WorkerScope.cpp
+++ b/dom/workers/WorkerScope.cpp
@@ -608,18 +608,18 @@ public:
 
 private:
   nsRefPtr<WorkerScopeUnregisterRunnable> mRunnable;
   State mState;
   bool mValue;
 };
 
 class WorkerScopeUnregisterRunnable final : public nsRunnable
-                                              , public nsIServiceWorkerUnregisterCallback
-                                              , public WorkerFeature
+                                          , public nsIServiceWorkerUnregisterCallback
+                                          , public WorkerFeature
 {
   WorkerPrivate* mWorkerPrivate;
   nsString mScope;
 
   // Worker thread only.
   nsRefPtr<Promise> mWorkerPromise;
   bool mCleanedUp;
 
--- a/dom/workers/WorkerScope.h
+++ b/dom/workers/WorkerScope.h
@@ -231,17 +231,17 @@ public:
   IMPL_EVENT_HANDLER(beforeevicted)
   IMPL_EVENT_HANDLER(evicted)
   IMPL_EVENT_HANDLER(fetch)
   IMPL_EVENT_HANDLER(install)
   IMPL_EVENT_HANDLER(message)
 };
 
 class WorkerDebuggerGlobalScope final : public DOMEventTargetHelper,
-                                            public nsIGlobalObject
+                                        public nsIGlobalObject
 {
   WorkerPrivate* mWorkerPrivate;
 
 public:
   explicit WorkerDebuggerGlobalScope(WorkerPrivate* aWorkerPrivate);
 
   NS_DECL_ISUPPORTS_INHERITED
 
--- a/dom/workers/XMLHttpRequest.cpp
+++ b/dom/workers/XMLHttpRequest.cpp
@@ -310,17 +310,17 @@ private:
     mProxy->Teardown();
     mProxy = nullptr;
 
     return NS_OK;
   }
 };
 
 class LoadStartDetectionRunnable final : public nsRunnable,
-                                             public nsIDOMEventListener
+                                         public nsIDOMEventListener
 {
   WorkerPrivate* mWorkerPrivate;
   nsRefPtr<Proxy> mProxy;
   nsRefPtr<nsXMLHttpRequest> mXHR;
   XMLHttpRequest* mXMLHttpRequestPrivate;
   nsString mEventType;
   uint32_t mChannelId;
   bool mReceivedLoadStart;
--- a/dom/workers/XMLHttpRequest.h
+++ b/dom/workers/XMLHttpRequest.h
@@ -24,17 +24,17 @@ class File;
 
 BEGIN_WORKERS_NAMESPACE
 
 class Proxy;
 class XMLHttpRequestUpload;
 class WorkerPrivate;
 
 class XMLHttpRequest final: public nsXHREventTarget,
-                                public WorkerFeature
+                            public WorkerFeature
 {
 public:
   struct StateData
   {
     nsString mResponseText;
     nsString mResponseURL;
     uint32_t mStatus;
     nsCString mStatusText;
--- a/dom/xbl/nsXBLService.cpp
+++ b/dom/xbl/nsXBLService.cpp
@@ -163,17 +163,17 @@ public:
   {
   }
 };
 
 // nsXBLStreamListener, a helper class used for
 // asynchronous parsing of URLs
 /* Header file */
 class nsXBLStreamListener final : public nsIStreamListener,
-                                      public nsIDOMEventListener
+                                  public nsIDOMEventListener
 {
 public:
   NS_DECL_ISUPPORTS
   NS_DECL_NSISTREAMLISTENER
   NS_DECL_NSIREQUESTOBSERVER
   NS_DECL_NSIDOMEVENTLISTENER
 
   nsXBLStreamListener(nsIDocument* aBoundDocument,
--- a/dom/xml/CDATASection.h
+++ b/dom/xml/CDATASection.h
@@ -9,17 +9,17 @@
 #include "mozilla/Attributes.h"
 #include "nsIDOMCDATASection.h"
 #include "mozilla/dom/Text.h"
 
 namespace mozilla {
 namespace dom {
 
 class CDATASection final : public Text,
-                               public nsIDOMCDATASection
+                           public nsIDOMCDATASection
 {
 private:
   void Init()
   {
     MOZ_ASSERT(mNodeInfo->NodeType() == nsIDOMNode::CDATA_SECTION_NODE,
                "Bad NodeType in aNodeInfo");
   }
 
--- a/dom/xslt/xpath/XPathResult.h
+++ b/dom/xslt/xpath/XPathResult.h
@@ -40,18 +40,18 @@ NS_DEFINE_STATIC_IID_ACCESSOR(nsIXPathRe
 
 namespace mozilla {
 namespace dom {
 
 /**
  * A class for evaluating an XPath expression string
  */
 class XPathResult final : public nsIXPathResult,
-                              public nsStubMutationObserver,
-                              public nsWrapperCache
+                          public nsStubMutationObserver,
+                          public nsWrapperCache
 {
     ~XPathResult();
 
 public:
     explicit XPathResult(nsINode* aParent);
     XPathResult(const XPathResult &aResult);
 
     enum {
--- a/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
+++ b/dom/xslt/xslt/txMozillaStylesheetCompiler.cpp
@@ -60,19 +60,19 @@ getSpec(nsIChannel* aChannel, nsAString&
     }
 
     nsAutoCString spec;
     uri->GetSpec(spec);
     AppendUTF8toUTF16(spec, aSpec);
 }
 
 class txStylesheetSink final : public nsIXMLContentSink,
-                                   public nsIExpatSink,
-                                   public nsIStreamListener,
-                                   public nsIInterfaceRequestor
+                               public nsIExpatSink,
+                               public nsIStreamListener,
+                               public nsIInterfaceRequestor
 {
 public:
     txStylesheetSink(txStylesheetCompiler* aCompiler, nsIParser* aParser);
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSIEXPATSINK
     NS_DECL_NSISTREAMLISTENER
     NS_DECL_NSIREQUESTOBSERVER
--- a/dom/xslt/xslt/txMozillaXMLOutput.h
+++ b/dom/xslt/xslt/txMozillaXMLOutput.h
@@ -24,17 +24,17 @@ class nsIDOMElement;
 class nsIStyleSheet;
 class nsIDOMNode;
 class nsITransformObserver;
 class nsNodeInfoManager;
 class nsIDocument;
 class nsINode;
 
 class txTransformNotifier final : public nsIScriptLoaderObserver,
-                                      public nsICSSLoaderObserver
+                                  public nsICSSLoaderObserver
 {
 public:
     txTransformNotifier();
 
     NS_DECL_ISUPPORTS
     NS_DECL_NSISCRIPTLOADEROBSERVER
     
     // nsICSSLoaderObserver
--- a/dom/xslt/xslt/txMozillaXSLTProcessor.h
+++ b/dom/xslt/xslt/txMozillaXSLTProcessor.h
@@ -45,20 +45,20 @@ class GlobalObject;
 "@mozilla.org/document-transformer;1?type=xslt"
 
 #define XSLT_MSGS_URL  "chrome://global/locale/xslt/xslt.properties"
 
 /**
  * txMozillaXSLTProcessor is a front-end to the XSLT Processor.
  */
 class txMozillaXSLTProcessor final : public nsIXSLTProcessor,
-                                         public nsIXSLTProcessorPrivate,
-                                         public nsIDocumentTransformer,
-                                         public nsStubMutationObserver,
-                                         public nsWrapperCache
+                                     public nsIXSLTProcessorPrivate,
+                                     public nsIDocumentTransformer,
+                                     public nsStubMutationObserver,
+                                     public nsWrapperCache
 {
 public:
     /**
      * Creates a new txMozillaXSLTProcessor
      */
     txMozillaXSLTProcessor();
 
     // nsISupports interface
--- a/dom/xslt/xslt/txStylesheetCompiler.h
+++ b/dom/xslt/xslt/txStylesheetCompiler.h
@@ -182,17 +182,17 @@ struct txStylesheetAttr
 {
     int32_t mNamespaceID;
     nsCOMPtr<nsIAtom> mLocalName;
     nsCOMPtr<nsIAtom> mPrefix;
     nsString mValue;
 };
 
 class txStylesheetCompiler final : private txStylesheetCompilerState,
-                                       public txACompileObserver
+                                   public txACompileObserver
 {
 public:
     friend class txStylesheetCompilerState;
     friend bool TX_XSLTFunctionAvailable(nsIAtom* aName,
                                            int32_t aNameSpaceID);
     txStylesheetCompiler(const nsAString& aStylesheetURI,
                          mozilla::net::ReferrerPolicy  aReferrerPolicy,
                          txACompileObserver* aObserver);
--- a/dom/xul/XULDocument.h
+++ b/dom/xul/XULDocument.h
@@ -82,21 +82,21 @@ private:
 /**
  * The XUL document class
  */
 
 namespace mozilla {
 namespace dom {
 
 class XULDocument final : public XMLDocument,
-                              public nsIXULDocument,
-                              public nsIDOMXULDocument,
-                              public nsIStreamLoaderObserver,
-                              public nsICSSLoaderObserver,
-                              public nsIOffThreadScriptReceiver
+                          public nsIXULDocument,
+                          public nsIDOMXULDocument,
+                          public nsIStreamLoaderObserver,
+                          public nsICSSLoaderObserver,
+                          public nsIOffThreadScriptReceiver
 {
 public:
     XULDocument();
 
     // nsISupports interface
     NS_DECL_ISUPPORTS_INHERITED
     NS_DECL_NSISTREAMLOADEROBSERVER
 
--- a/dom/xul/nsXULContentSink.h
+++ b/dom/xul/nsXULContentSink.h
@@ -18,17 +18,17 @@
 class nsIDocument;
 class nsIScriptSecurityManager;
 class nsAttrName;
 class nsXULPrototypeDocument;
 class nsXULPrototypeElement;
 class nsXULPrototypeNode;
 
 class XULContentSinkImpl final : public nsIXMLContentSink,
-                                     public nsIExpatSink
+                                 public nsIExpatSink
 {
 public:
     XULContentSinkImpl();
 
     // nsISupports
     NS_DECL_CYCLE_COLLECTING_ISUPPORTS
     NS_DECL_NSIEXPATSINK
 
--- a/dom/xul/nsXULElement.cpp
+++ b/dom/xul/nsXULElement.cpp
@@ -119,17 +119,17 @@ uint32_t             nsXULPrototypeAttri
 uint32_t             nsXULPrototypeAttribute::gNumAttributes;
 uint32_t             nsXULPrototypeAttribute::gNumCacheTests;
 uint32_t             nsXULPrototypeAttribute::gNumCacheHits;
 uint32_t             nsXULPrototypeAttribute::gNumCacheSets;
 uint32_t             nsXULPrototypeAttribute::gNumCacheFills;
 #endif
 
 class nsXULElementTearoff final : public nsIDOMElementCSSInlineStyle,
-                                      public nsIFrameLoaderOwner
+                                  public nsIFrameLoaderOwner
 {
   ~nsXULElementTearoff() {}
 
 public:
   NS_DECL_CYCLE_COLLECTING_ISUPPORTS
   NS_DECL_CYCLE_COLLECTION_CLASS_AMBIGUOUS(nsXULElementTearoff,
                                            nsIDOMElementCSSInlineStyle)
 
--- a/dom/xul/nsXULElement.h
+++ b/dom/xul/nsXULElement.h
@@ -363,17 +363,17 @@ enum {
 
 ASSERT_NODE_FLAGS_SPACE(ELEMENT_TYPE_SPECIFIC_BITS_OFFSET + 3);
 
 #undef XUL_ELEMENT_FLAG_BIT
 
 class nsScriptEventHandlerOwnerTearoff;
 
 class nsXULElement final : public nsStyledElement,
-                               public nsIDOMXULElement
+                           public nsIDOMXULElement
 {
 public:
     explicit nsXULElement(already_AddRefed<mozilla::dom::NodeInfo> aNodeInfo);
 
     static nsresult
     Create(nsXULPrototypeElement* aPrototype, nsIDocument* aDocument,
            bool aIsScriptable, bool aIsRoot, mozilla::dom::Element** aResult);
 
--- a/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
+++ b/dom/xul/templates/nsXULTemplateQueryProcessorRDF.h
@@ -36,17 +36,17 @@ extern PRLogModuleInfo* gXULTemplateLog;
 class nsIContent;
 class nsIRDFCompositeDataSource;
 class nsXULTemplateResultRDF;
 
 /**
  * An object that generates results from a query on an RDF graph
  */
 class nsXULTemplateQueryProcessorRDF final : public nsIXULTemplateQueryProcessor,
-                                                 public nsIRDFObserver
+                                             public nsIRDFObserver
 {
 public:
     typedef nsTArray<nsRefPtr<nsXULTemplateResultRDF> > ResultArray;
 
     nsXULTemplateQueryProcessorRDF();
 
     nsresult InitGlobals();
 
--- a/dom/xul/templates/nsXULTemplateQueryProcessorXML.h
+++ b/dom/xul/templates/nsXULTemplateQueryProcessorXML.h
@@ -114,17 +114,17 @@ public:
         : mQuery(aQuery),
           mBindingSet(aBindingSet),
           mResults(aResults),
           mPosition(0)
     {}
 };
 
 class nsXULTemplateQueryProcessorXML final : public nsIXULTemplateQueryProcessor,
-                                                 public nsIDOMEventListener
+                                             public nsIDOMEventListener
 {
 public:
 
     nsXULTemplateQueryProcessorXML()
         : mGenerationStarted(false)
     {}
 
     // nsISupports interface
--- a/editor/composer/nsEditingSession.h
+++ b/editor/composer/nsEditingSession.h
@@ -39,18 +39,18 @@ class nsITimer;
 class nsComposerCommandsUpdater;
 class nsIChannel;
 class nsIControllers;
 class nsIDocShell;
 class nsIEditor;
 class nsIWebProgress;
 
 class nsEditingSession final : public nsIEditingSession,
-                                   public nsIWebProgressListener,
-                                   public nsSupportsWeakReference
+                               public nsIWebProgressListener,
+                               public nsSupportsWeakReference
 {
 public:
 
   nsEditingSession();
 
   // nsISupports
   NS_DECL_ISUPPORTS
 
--- a/editor/libeditor/nsHTMLEditor.h
+++ b/editor/libeditor/nsHTMLEditor.h
@@ -60,24 +60,24 @@ struct IMEState;
 } // namespace widget
 } // namespace mozilla
 
 /**
  * The HTML editor implementation.<br>
  * Use to edit HTML document represented as a DOM tree. 
  */
 class nsHTMLEditor final : public nsPlaintextEditor,
-                               public nsIHTMLEditor,
-                               public nsIHTMLObjectResizer,
-                               public nsIHTMLAbsPosEditor,
-                               public nsITableEditor,
-                               public nsIHTMLInlineTableEditor,
-                               public nsIEditorStyleSheets,
-                               public nsICSSLoaderObserver,
-                               public nsStubMutationObserver
+                           public nsIHTMLEditor,
+                           public nsIHTMLObjectResizer,
+                           public nsIHTMLAbsPosEditor,
+                           public nsITableEditor,
+                           public nsIHTMLInlineTableEditor,
+                           public nsIEditorStyleSheets,
+                           public nsICSSLoaderObserver,
+                           public nsStubMutationObserver
 {
   typedef enum {eNoOp, eReplaceParent=1, eInsertParent=2} BlockTransformationType;
 
 public:
 
   enum ResizingRequestID
   {
     kX      = 0,
--- a/editor/txmgr/nsTransactionManager.h
+++ b/editor/txmgr/nsTransactionManager.h
@@ -19,17 +19,17 @@
 class nsITransaction;
 class nsITransactionListener;
 class nsTransactionItem;
 
 /** implementation of a transaction manager object.
  *
  */
 class nsTransactionManager final : public nsITransactionManager
-                                     , public nsSupportsWeakReference
+                                 , public nsSupportsWeakReference
 {
 private:
 
   int32_t                mMaxTransactionCount;
   nsTransactionStack     mDoStack;
   nsTransactionStack     mUndoStack;
   nsTransactionStack     mRedoStack;
   nsCOMArray<nsITransactionListener> mListeners;
--- a/editor/txtsvc/nsTextServicesDocument.h
+++ b/editor/txtsvc/nsTextServicesDocument.h
@@ -28,17 +28,17 @@ class nsISelection;
 class nsISelectionController;
 class nsITextServicesFilter;
 class nsString;
 
 /** implementation of a text services object.
  *
  */
 class nsTextServicesDocument final : public nsITextServicesDocument,
-                                         public nsIEditActionListener
+                                     public nsIEditActionListener
 {
 private:
   static nsIAtom *sAAtom;
   static nsIAtom *sAddressAtom;
   static nsIAtom *sBigAtom;
   static nsIAtom *sBAtom;
   static nsIAtom *sCiteAtom;
   static nsIAtom *sCodeAtom;
--- a/embedding/browser/nsDocShellTreeOwner.h
+++ b/embedding/browser/nsDocShellTreeOwner.h
@@ -56,22 +56,22 @@ class nsICDocShellTreeOwner : public nsI
 public:
     NS_DECLARE_STATIC_IID_ACCESSOR(NS_ICDOCSHELLTREEOWNER_IID)
 };
 
 NS_DEFINE_STATIC_IID_ACCESSOR(nsICDocShellTreeOwner,
                               NS_ICDOCSHELLTREEOWNER_IID)
 
 class nsDocShellTreeOwner final : public nsIDocShellTreeOwner,
-                                      public nsIBaseWindow,
-                                      public nsIInterfaceRequestor,
-                                      public nsIWebProgressListener,
-                                      public nsIDOMEventListener,
-                                      public nsICDocShellTreeOwner,
-                                      public nsSupportsWeakReference
+                                  public nsIBaseWindow,
+                                  public nsIInterfaceRequestor,
+                                  public nsIWebProgressListener,
+                                  public nsIDOMEventListener,
+                                  public nsICDocShellTreeOwner,
+                                  public nsSupportsWeakReference
 {
 friend class nsWebBrowser;
 friend class nsCommandHandler;
 
 public:
     NS_DECL_ISUPPORTS
 
     NS_DECL_NSIBASEWINDOW
--- a/embedding/browser/nsWebBrowser.h
+++ b/embedding/browser/nsWebBrowser.h
@@ -68,29 +68,29 @@ public:
 };
 
 //  {cda5863a-aa9c-411e-be49-ea0d525ab4b5} -
 #define NS_WEBBROWSER_CID \
 {0xcda5863a, 0xaa9c, 0x411e, { 0xbe, 0x49, 0xea, 0x0d, 0x52, 0x5a, 0xb4, 0xb5 }}
 
 
 class nsWebBrowser final : public nsIWebBrowser,
-                               public nsIWebNavigation,
-                               public nsIWebBrowserSetup,
-                               public nsIDocShellTreeItem,
-                               public nsIBaseWindow,
-                               public nsIScrollable,
-                               public nsITextScroll,
-                               public nsIInterfaceRequestor,
-                               public nsIWebBrowserPersist,
-                               public nsIWebBrowserFocus,
-                               public nsIWebProgressListener,
-                               public nsIWebBrowserStream,
-                               public nsIWidgetListener,
-                               public nsSupportsWeakReference
+                           public nsIWebNavigation,
+                           public nsIWebBrowserSetup,
+                           public nsIDocShellTreeItem,
+                           public nsIBaseWindow,
+                           public nsIScrollable,
+                           public nsITextScroll,
+                           public nsIInterfaceRequestor,
+                           public nsIWebBrowserPersist,
+                           public nsIWebBrowserFocus,
+                           public nsIWebProgressListener,
+                           public nsIWebBrowserStream,
+                           public nsIWidgetListener,
+                           public nsSupportsWeakReference
 {
   friend class nsDocShellTreeOwner;
 public:
   nsWebBrowser();
 
   NS_DECL_ISUPPORTS
 
   NS_DECL_NSIBASEWINDOW