Landings for Stack Containing D106029

Failed to land

Landing requested on , by zzabaneh@mozilla.com.

Revisions: D106029 diff 405568

While applying revision D106029 to mozilla-central, the following files had conflicts:

(Hint: try rebasing your changes on the latest commits from mozilla-central and re-submitting.)

  • xpfe/appshell/AppWindow.cpp @ 14358973739cbd590dac55abb23d78f6409e7ef8
  • --- AppWindow.cpp
    +++ AppWindow.cpp
    ...
    
    --- AppWindow.cpp
    +++ AppWindow.cpp
    @@ -3145,7 +3145,7 @@
             RefPtr<Promise> promise = l10n->Ready();
             MOZ_ASSERT(promise);
             RefPtr<L10nReadyPromiseHandler> handler =
    -          new L10nReadyPromiseHandler(menubarDoc, mWindow);
    +            new L10nReadyPromiseHandler(menubarDoc, mWindow);
             promise->AppendNativeHandler(handler);
           } else {
             // Something went wrong loading the doc and l10n wasn't created. This
    
  • security/manager/ssl/TransportSecurityInfo.h @ 38345c699f68b7cf69ec49898e5b6c05e283ffec
  • --- TransportSecurityInfo.h
    +++ TransportSecurityInfo.h
    ...
    
    --- TransportSecurityInfo.h
    +++ TransportSecurityInfo.h
    @@ -71,7 +71,8 @@
         MutexAutoLock lock(mMutex);
         return mOriginAttributes;
       }
    -  const OriginAttributes& GetOriginAttributes(MutexAutoLock& aProofOfLock) const {
    +  const OriginAttributes& GetOriginAttributes(
    +      MutexAutoLock& aProofOfLock) const {
         return mOriginAttributes;
       }
       void SetOriginAttributes(const OriginAttributes& aOriginAttributes);
    
  • layout/base/AccessibleCaretManager.h @ 5fd34b0e1406d87254a772177abfd485bf0e9ae2
  • --- AccessibleCaretManager.h
    +++ AccessibleCaretManager.h
    ...
    
    --- AccessibleCaretManager.h
    +++ AccessibleCaretManager.h
    @@ -345,7 +345,7 @@
         // OnScrollPositionChanged().
         bool mAllowFlushing = true;
     
    -  private:
    +   private:
         // Whether we're flushing layout, used for sanity-checking.
         bool mFlushing = false;
       };
    
  • layout/base/AccessibleCaretManager.cpp @ 38345c699f68b7cf69ec49898e5b6c05e283ffec
  • --- AccessibleCaretManager.cpp
    +++ AccessibleCaretManager.cpp
    ...
    
    --- AccessibleCaretManager.cpp
    +++ AccessibleCaretManager.cpp
    @@ -87,8 +87,7 @@
     }
     
     AccessibleCaretManager::LayoutFlusher::~LayoutFlusher() {
    -  MOZ_RELEASE_ASSERT(!mFlushing,
    -                     "Going away in MaybeFlush? Bad!");
    +  MOZ_RELEASE_ASSERT(!mFlushing, "Going away in MaybeFlush? Bad!");
     }
     
     void AccessibleCaretManager::Terminate() {
    
  • js/src/frontend/BytecodeEmitter.cpp @ c4a032c9bf84a9b3ad35cfadbe758aa9cb28d080
  • --- BytecodeEmitter.cpp
    +++ BytecodeEmitter.cpp
    ...
    
    --- BytecodeEmitter.cpp
    +++ BytecodeEmitter.cpp
    @@ -10,8 +10,8 @@
     
     #include "frontend/BytecodeEmitter.h"
     
    -#include "mozilla/Casting.h"     // mozilla::AssertedCast
    -#include "mozilla/DebugOnly.h"   // mozilla::DebugOnly
    +#include "mozilla/Casting.h"    // mozilla::AssertedCast
    +#include "mozilla/DebugOnly.h"  // mozilla::DebugOnly
     #include "mozilla/FloatingPoint.h"  // mozilla::NumberEqualsInt32, mozilla::NumberIsInt32
     #include "mozilla/Maybe.h"          // mozilla::{Maybe,Nothing,Some}
     #include "mozilla/PodOperations.h"  // mozilla::PodCopy
    
  • js/src/builtin/Object.cpp @ de42fd2add29ae897676076cf9ccdef033d46100
  • --- Object.cpp
    +++ Object.cpp
    ...
    
    --- Object.cpp
    +++ Object.cpp
    @@ -690,14 +690,14 @@
       if (!tag.isString()) {
         if (!builtinTag) {
           builtinTag = GetBuiltinTagFast(obj, clasp, cx);
    -  #ifdef DEBUG
    +#ifdef DEBUG
           // Assert this fast path is correct and matches BuiltinTagSlow.
           JSString* builtinTagSlow = GetBuiltinTagSlow(cx, obj);
           if (!builtinTagSlow) {
             return false;
           }
           MOZ_ASSERT(builtinTagSlow == builtinTag);
    -  #endif
    +#endif
         }
     
         args.rval().setString(builtinTag);
    
  • js/public/HeapAPI.h @ 6214d7dd8d9b784bc65dffdced1adb01365dd866
  • --- HeapAPI.h
    +++ HeapAPI.h
    ...
    
    --- HeapAPI.h
    +++ HeapAPI.h
    @@ -159,7 +159,7 @@
     #ifdef JS_GC_SMALL_CHUNK_SIZE
     #  define EXPECTED_ARENA_COUNT 63
     #else
    -# define EXPECTED_ARENA_COUNT 252
    +#  define EXPECTED_ARENA_COUNT 252
     #endif
     static_assert(ArenasPerChunk == EXPECTED_ARENA_COUNT,
                   "Do not accidentally change our heap's density.");
    
  • dom/html/nsHTMLDNSPrefetch.h @ f786edb318188d2a20f1b262c262413bb7c8fa49
  • --- nsHTMLDNSPrefetch.h
    +++ nsHTMLDNSPrefetch.h
    ...
    
    --- nsHTMLDNSPrefetch.h
    +++ nsHTMLDNSPrefetch.h
    @@ -63,8 +63,8 @@
           const nsAString& host, bool isHttps,
           const mozilla::OriginAttributes& aPartitionedPrincipalOriginAttributes,
           nsIRequest::TRRMode aTRRMode, Priority, nsresult aReason);
    -  static nsresult CancelPrefetch(mozilla::dom::Link* aElement,
    -                                 Priority, nsresult aReason);
    +  static nsresult CancelPrefetch(mozilla::dom::Link* aElement, Priority,
    +                                 nsresult aReason);
     
       static void LinkDestroyed(mozilla::dom::Link* aLink);
     
    
  • dom/base/nsContentUtils.cpp @ f0a9f8d39f4d3dc97767d7dc86e7e544b59aaa67
  • --- nsContentUtils.cpp
    +++ nsContentUtils.cpp
    ...
    
    --- nsContentUtils.cpp
    +++ nsContentUtils.cpp
    @@ -8902,9 +8902,9 @@
       }
     
       static const nsAtom* nonEscapingElements[] = {
    -      nsGkAtoms::style, nsGkAtoms::script, nsGkAtoms::xmp, nsGkAtoms::iframe,
    -      nsGkAtoms::noembed, nsGkAtoms::noframes, nsGkAtoms::plaintext,
    -      nsGkAtoms::noscript};
    +      nsGkAtoms::style,     nsGkAtoms::script,  nsGkAtoms::xmp,
    +      nsGkAtoms::iframe,    nsGkAtoms::noembed, nsGkAtoms::noframes,
    +      nsGkAtoms::plaintext, nsGkAtoms::noscript};
       static mozilla::BloomFilter<12, nsAtom> sFilter;
       static bool sInitialized = false;
       if (!sInitialized) {
    
  • dom/base/Link.h @ 38345c699f68b7cf69ec49898e5b6c05e283ffec
  • --- Link.h
    +++ Link.h
    ...
    
    --- Link.h
    +++ Link.h
    @@ -11,7 +11,7 @@
     #ifndef mozilla_dom_Link_h__
     #define mozilla_dom_Link_h__
     
    -#include "nsWrapperCache.h" // For nsWrapperCache::FlagsType
    +#include "nsWrapperCache.h"  // For nsWrapperCache::FlagsType
     #include "nsCOMPtr.h"
     
     class nsIURI;
    
  • docshell/base/BrowsingContext.cpp @ ff46eda9cc314eb255bb17fccb9c052c1d2107a0
  • --- BrowsingContext.cpp
    +++ BrowsingContext.cpp
    ...
    
    --- BrowsingContext.cpp
    +++ BrowsingContext.cpp
    @@ -2513,8 +2513,7 @@
       });
     }
     
    -bool BrowsingContext::CheckOnlyOwningProcessCanSet(
    -    ContentParent* aSource) {
    +bool BrowsingContext::CheckOnlyOwningProcessCanSet(ContentParent* aSource) {
       if (aSource) {
         MOZ_ASSERT(XRE_IsParentProcess());
     
    
Raw error output:
Problem while applying patch in revision 106029:

hg error in cmd: hg import --no-commit -s 95 /tmp/tmpzawjn06s: applying /tmp/tmpzawjn06s

patching file xpfe/appshell/AppWindow.cpp
Hunk #1 FAILED at 3144
1 out of 1 hunks FAILED -- saving rejects to file xpfe/appshell/AppWindow.cpp.rej
patching file security/manager/ssl/TransportSecurityInfo.h
Hunk #1 FAILED at 70
1 out of 1 hunks FAILED -- saving rejects to file security/manager/ssl/TransportSecurityInfo.h.rej
patching file layout/base/AccessibleCaretManager.h
Hunk #1 FAILED at 344
1 out of 1 hunks FAILED -- saving rejects to file layout/base/AccessibleCaretManager.h.rej
patching file layout/base/AccessibleCaretManager.cpp
Hunk #1 FAILED at 86
1 out of 1 hunks FAILED -- saving rejects to file layout/base/AccessibleCaretManager.cpp.rej
patching file js/src/frontend/BytecodeEmitter.cpp
Hunk #1 FAILED at 9
1 out of 1 hunks FAILED -- saving rejects to file js/src/frontend/BytecodeEmitter.cpp.rej
patching file js/src/builtin/Object.cpp
Hunk #1 FAILED at 689
1 out of 1 hunks FAILED -- saving rejects to file js/src/builtin/Object.cpp.rej
patching file js/public/HeapAPI.h
Hunk #1 FAILED at 158
1 out of 1 hunks FAILED -- saving rejects to file js/public/HeapAPI.h.rej
unable to find 'dom/html/nsHTMLDNSPrefetch.h' for patching
(use '--prefix' to apply patch relative to the current directory)
1 out of 1 hunks FAILED -- saving rejects to file dom/html/nsHTMLDNSPrefetch.h.rej
patching file dom/base/nsContentUtils.cpp
Hunk #1 FAILED at 8901
1 out of 1 hunks FAILED -- saving rejects to file dom/base/nsContentUtils.cpp.rej
patching file dom/base/Link.h
Hunk #1 FAILED at 10
1 out of 1 hunks FAILED -- saving rejects to file dom/base/Link.h.rej
patching file docshell/base/BrowsingContext.cpp
Hunk #1 FAILED at 2512
1 out of 1 hunks FAILED -- saving rejects to file docshell/base/BrowsingContext.cpp.rej
abort: patch failed to apply
Cancelled

Landing requested on , by zzabaneh@mozilla.com.

Revisions: D106029 diff 405568

Failed to land

Landing requested on , by jstutte@mozilla.com.

Revisions: D106029 diff 405568

Raw error output:
We're sorry, Lando could not rebase your commits for you automatically. Please manually rebase your commits and try again.

hg error in cmd: hg import --no-commit -s 95 /tmp/tmp1jgkkgoq: applying /tmp/tmp1jgkkgoq

patching file xpfe/appshell/AppWindow.cpp
Hunk #1 FAILED at 3144
1 out of 1 hunks FAILED -- saving rejects to file xpfe/appshell/AppWindow.cpp.rej
patching file security/manager/ssl/TransportSecurityInfo.h
Hunk #1 FAILED at 70
1 out of 1 hunks FAILED -- saving rejects to file security/manager/ssl/TransportSecurityInfo.h.rej
patching file layout/base/AccessibleCaretManager.h
Hunk #1 FAILED at 344
1 out of 1 hunks FAILED -- saving rejects to file layout/base/AccessibleCaretManager.h.rej
patching file layout/base/AccessibleCaretManager.cpp
Hunk #1 FAILED at 86
1 out of 1 hunks FAILED -- saving rejects to file layout/base/AccessibleCaretManager.cpp.rej
patching file js/src/frontend/BytecodeEmitter.cpp
Hunk #1 FAILED at 9
1 out of 1 hunks FAILED -- saving rejects to file js/src/frontend/BytecodeEmitter.cpp.rej
patching file js/src/builtin/Object.cpp
Hunk #1 FAILED at 689
1 out of 1 hunks FAILED -- saving rejects to file js/src/builtin/Object.cpp.rej
patching file js/public/HeapAPI.h
Hunk #1 FAILED at 158
1 out of 1 hunks FAILED -- saving rejects to file js/public/HeapAPI.h.rej
unable to find 'dom/html/nsHTMLDNSPrefetch.h' for patching
(use '--prefix' to apply patch relative to the current directory)
1 out of 1 hunks FAILED -- saving rejects to file dom/html/nsHTMLDNSPrefetch.h.rej
patching file dom/base/nsContentUtils.cpp
Hunk #1 FAILED at 8901
1 out of 1 hunks FAILED -- saving rejects to file dom/base/nsContentUtils.cpp.rej
patching file dom/base/Link.h
Hunk #1 FAILED at 10
1 out of 1 hunks FAILED -- saving rejects to file dom/base/Link.h.rej
patching file docshell/base/BrowsingContext.cpp
Hunk #1 FAILED at 2512
1 out of 1 hunks FAILED -- saving rejects to file docshell/base/BrowsingContext.cpp.rej
abort: patch failed to apply

Stack containing revision D106029

Land Bug Status Revision Reviewers
1678330
Blocked
Repository is not supported by Lando.
Abandoned
D106029: Bug 1678330: Ensure nested SpinEventLoopUntil(OrShutdown) calls are traceable to the originating source in case of crash. r?nika
  • @nika accepted a prior diff
  • @agi resigned
  • @nhnt11 to review