Commit a1dce644 authored by Sylvestre Ledru's avatar Sylvestre Ledru
Browse files

Bug 1519636 - Reformat recent changes to the Google coding style r=Ehsan 

# ignore-this-changeset

Differential Revision: https://phabricator.services.mozilla.com/D28329

--HG--
extra : moz-landing-system : lando
parent c5184815

accessible/base/nsAccessibilityService.cpp

+2 −1
Original line number Diff line number Diff line
@@ -1395,7 +1395,8 @@ nsAccessibilityService::CreateAccessibleByFrameType(nsIFrame* aFrame, 
        table = aContext->Parent();



      if (table) {

        nsIContent* parentContent = aContent->GetParentOrHostNode()->AsContent();

        nsIContent* parentContent =

            aContent->GetParentOrHostNode()->AsContent();

        nsIFrame* parentFrame = nullptr;

        if (parentContent) {

          parentFrame = parentContent->GetPrimaryFrame();

browser/app/winlauncher/DllBlocklistWin.cpp

+3 −4
Original line number Diff line number Diff line
@@ -346,9 +346,8 @@ LauncherVoidResult InitializeDllBlocklistOOP(const wchar_t* aFullImagePath, 


  // As part of our mitigation of binary tampering, copy our import directory

  // from the original in our executable file.

  LauncherVoidResult importDirRestored =

    RestoreImportDirectory(aFullImagePath, ourExeImage, aChildProcess,

                           ourModule);

  LauncherVoidResult importDirRestored = RestoreImportDirectory(

      aFullImagePath, ourExeImage, aChildProcess, ourModule);

  if (importDirRestored.isErr()) {

    return importDirRestored;

  }

browser/app/winlauncher/LauncherProcessWin.cpp

+5 −7
Original line number Diff line number Diff line
@@ -41,10 +41,9 @@ 
 *

 * @return Ok if browser startup should proceed

 */

static mozilla::LauncherVoidResult PostCreationSetup(const wchar_t* aFullImagePath,

                                                     HANDLE aChildProcess,

                                                     HANDLE aChildMainThread,

                                                     const bool aIsSafeMode) {

static mozilla::LauncherVoidResult PostCreationSetup(

    const wchar_t* aFullImagePath, HANDLE aChildProcess,

    HANDLE aChildMainThread, const bool aIsSafeMode) {

  // The launcher process's DLL blocking code is incompatible with ASAN because

  // it is able to execute before ASAN itself has even initialized.

  // Also, the AArch64 build doesn't yet have a working interceptor.
@@ -332,9 +331,8 @@ Maybe<int> LauncherMain(int& argc, wchar_t* argv[], 
  nsAutoHandle process(pi.hProcess);

  nsAutoHandle mainThread(pi.hThread);



  LauncherVoidResult setupResult =

      PostCreationSetup(argv[0], process.get(), mainThread.get(),

                        isSafeMode.value());

  LauncherVoidResult setupResult = PostCreationSetup(

      argv[0], process.get(), mainThread.get(), isSafeMode.value());

  if (setupResult.isErr()) {

    HandleLauncherError(setupResult);

    ::TerminateProcess(process.get(), 1);

caps/OriginAttributes.cpp

+2 −1
Original line number Diff line number Diff line
@@ -268,7 +268,8 @@ class MOZ_STACK_CLASS PopulateFromSuffixIterator final 
    }



    if (aName.EqualsLiteral("geckoViewUserContextId")) {

      MOZ_RELEASE_ASSERT(mOriginAttributes->mGeckoViewSessionContextId.IsEmpty());

      MOZ_RELEASE_ASSERT(

          mOriginAttributes->mGeckoViewSessionContextId.IsEmpty());

      mOriginAttributes->mGeckoViewSessionContextId.Assign(aValue);

      return true;

    }

caps/OriginAttributes.h

+6 −3
Original line number Diff line number Diff line
@@ -156,7 +156,8 @@ class OriginAttributesPattern : public dom::OriginAttributesPatternDictionary { 
    }



    if (mGeckoViewSessionContextId.WasPassed() &&

        mGeckoViewSessionContextId.Value() != aAttrs.mGeckoViewSessionContextId) {

        mGeckoViewSessionContextId.Value() !=

            aAttrs.mGeckoViewSessionContextId) {

      return false;

    }
@@ -191,8 +192,10 @@ class OriginAttributesPattern : public dom::OriginAttributesPatternDictionary { 
      return false;

    }



    if (mGeckoViewSessionContextId.WasPassed() && aOther.mGeckoViewSessionContextId.WasPassed() &&

        mGeckoViewSessionContextId.Value() != aOther.mGeckoViewSessionContextId.Value()) {

    if (mGeckoViewSessionContextId.WasPassed() &&

        aOther.mGeckoViewSessionContextId.WasPassed() &&

        mGeckoViewSessionContextId.Value() !=

            aOther.mGeckoViewSessionContextId.Value()) {

      return false;

    }