Tiny chronological shuffle

mozilla-release/patches/1463596-62a1.patch

@@ -2,7 +2,7 @@
 # User Aaron Klotz <aklotz@mozilla.com>
 # Date 1527115849 21600
 # Node ID 3518510139bbb70636739b271fb6fe602e5c644b
-# Parent  d93aaa10e3dcd0b3df226e3d1f64ef0ce97ca5ab
+# Parent  495f44a2a66f8718f0a5a34e8c791e9889cbf8c4
 Bug 1463596: Ensure that WritableTargetFunction correctly handles changing of protection attributes across regions that straddle page boundaries and have different initial protection attributes; r=handyman
 
 diff --git a/mozglue/misc/interceptor/TargetFunction.h b/mozglue/misc/interceptor/TargetFunction.h
@@ -152,7 +152,7 @@ diff --git a/mozglue/misc/interceptor/TargetFunction.h b/mozglue/misc/intercepto
      , mOffset(aOther.mOffset)
      , mStartWriteOffset(aOther.mStartWriteOffset)
 -    , mPrevProt(aOther.mPrevProt)
-     , mLocalBytes(Move(aOther.mLocalBytes))
+     , mLocalBytes(std::move(aOther.mLocalBytes))
      , mAccumulatedStatus(aOther.mAccumulatedStatus)
 +    , mProtect(std::move(aOther.mProtect))
    {

mozilla-release/patches/1465585-3-std-62a1.patch

@@ -2,7 +2,7 @@
 # User Emilio Cobos Alvarez <emilio@crisal.io>
 # Date 1527707735 -7200
 # Node ID b54db66223586b4e04f5cb926fccdacf8a176b91
-# Parent  b4c1922cc24fbd896d9cdeb8ae8f37989ca77134
+# Parent  348b2f65718971728a92b7c463a16cc437132be8
 Bug 1465585: Switch from mozilla::Move to std::move. r=froydnj
 
 This was done automatically replacing:
@@ -2342,7 +2342,7 @@ diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry
    MOZ_ASSERT(mCustomDefinitions.Count() == mConstructors.count(),
               "Number of entries should be the same");
  
-@@ -1070,17 +1070,17 @@ CustomElementReactionsStack::EnqueueUpgr
+@@ -1031,17 +1031,17 @@ CustomElementReactionsStack::EnqueueUpgr
  {
    Enqueue(aElement, new CustomElementUpgradeReaction(aDefinition));
  }
@@ -2361,7 +2361,7 @@ diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry
  {
    RefPtr<CustomElementData> elementData = aElement->GetCustomElementData();
    MOZ_ASSERT(elementData, "CustomElementData should exist");
-@@ -1154,17 +1154,17 @@ CustomElementReactionsStack::InvokeReact
+@@ -1115,17 +1115,17 @@ CustomElementReactionsStack::InvokeReact
        // unlinked, no need to fire the callbacks in this case.
        continue;
      }
@@ -2380,7 +2380,7 @@ diff --git a/dom/base/CustomElementRegistry.cpp b/dom/base/CustomElementRegistry
            if (rv.MaybeSetPendingException(cx)) {
              aes->ReportException();
            }
-@@ -1226,15 +1226,15 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(C
+@@ -1187,15 +1187,15 @@ NS_IMPL_CYCLE_COLLECTION_UNROOT_NATIVE(C
  CustomElementDefinition::CustomElementDefinition(nsIAtom* aType,
                                                   nsIAtom* aLocalName,
                                                   Function* aConstructor,
@@ -8713,7 +8713,7 @@ diff --git a/dom/ipc/TabChild.cpp b/dom/ipc/TabChild.cpp
 diff --git a/dom/ipc/TabParent.cpp b/dom/ipc/TabParent.cpp
 --- a/dom/ipc/TabParent.cpp
 +++ b/dom/ipc/TabParent.cpp
-@@ -3183,17 +3183,17 @@ TabParent::RecvInvokeDragSession(nsTArra
+@@ -3204,17 +3204,17 @@ TabParent::RecvInvokeDragSession(nsTArra
        // session.
        Manager()->AsContentParent()->SetInputPriorityEventEnabled(true);
      }
@@ -31905,7 +31905,7 @@ diff --git a/js/src/frontend/Parser.cpp b/js/src/frontend/Parser.cpp
 diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
 --- a/js/src/frontend/TokenStream.cpp
 +++ b/js/src/frontend/TokenStream.cpp
-@@ -715,36 +715,36 @@ TokenStreamSpecific<CharT, AnyCharsAcces
+@@ -721,36 +721,36 @@ TokenStreamSpecific<CharT, AnyCharsAcces
      if (!strictMode && !anyChars.options().extraWarningsOption)
          return true;
  
@@ -31946,7 +31946,7 @@ diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
      err->isMuted = mutedErrors;
      err->filename = filename_;
      err->lineNumber = 0;
-@@ -893,43 +893,43 @@ void
+@@ -899,43 +899,43 @@ void
  TokenStreamSpecific<CharT, AnyCharsAccess>::reportError(unsigned errorNumber, ...)
  {
      va_list args;
@@ -31993,7 +31993,7 @@ diff --git a/js/src/frontend/TokenStream.cpp b/js/src/frontend/TokenStream.cpp
  
  template<typename CharT, class AnyCharsAccess>
  bool
-@@ -941,48 +941,48 @@ TokenStreamSpecific<CharT, AnyCharsAcces
+@@ -947,48 +947,48 @@ TokenStreamSpecific<CharT, AnyCharsAcces
      TokenStreamAnyChars& anyChars = anyCharsAccess();
      if (!anyChars.options().extraWarningsOption)
          return true;
@@ -43527,7 +43527,7 @@ diff --git a/media/webrtc/signaling/src/jsep/JsepTrack.cpp b/media/webrtc/signal
 diff --git a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
 --- a/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
 +++ b/media/webrtc/signaling/src/media-conduit/VideoConduit.cpp
-@@ -1984,24 +1984,24 @@ WebrtcVideoConduit::ReceivedRTPPacket(co
+@@ -1993,24 +1993,24 @@ WebrtcVideoConduit::ReceivedRTPPacket(co
      // dispatches back to us, it's less critial to do this here, but doesn't
      // hurt.
      UniquePtr<QueuedPacket> packet((QueuedPacket*) malloc(sizeof(QueuedPacket) + len-1));
@@ -45674,7 +45674,7 @@ diff --git a/mfbt/tests/TestTuple.cpp b/mfbt/tests/TestTuple.cpp
 diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
 --- a/mfbt/tests/TestUniquePtr.cpp
 +++ b/mfbt/tests/TestUniquePtr.cpp
-@@ -72,17 +72,17 @@ ReturnUniqueA()
+@@ -70,17 +70,17 @@ ReturnUniqueA()
  {
    return UniqueA(new B);
  }
@@ -45693,7 +45693,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
    // Make sure UniquePtr will use its deleter's pointer type if it defines one.
    typedef int* Ptr;
    struct Deleter {
-@@ -107,17 +107,17 @@ TestDefaultFreeGuts()
+@@ -105,17 +105,17 @@ TestDefaultFreeGuts()
  
    n1 = nullptr;
    CHECK(!n1);
@@ -45712,7 +45712,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
    CHECK(n1.get() == p1);
    CHECK(n2.get() == nullptr);
  
-@@ -157,37 +157,37 @@ TestDefaultFreeGuts()
+@@ -155,37 +155,37 @@ TestDefaultFreeGuts()
    CHECK(a1->mX == 5);
    a1.reset(nullptr);
    CHECK(gADestructorCalls == 2);
@@ -45754,7 +45754,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
    CHECK(gBDestructorCalls == 3);
  
    ReturnLocalA();
-@@ -196,23 +196,23 @@ TestDefaultFreeGuts()
+@@ -194,23 +194,23 @@ TestDefaultFreeGuts()
  
    UniqueA a6(ReturnLocalA());
    a6 = nullptr;
@@ -45780,7 +45780,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
    CHECK(a5);
    CHECK(a7);
    CHECK(a8);
-@@ -255,17 +255,17 @@ TestFreeClass()
+@@ -253,17 +253,17 @@ TestFreeClass()
      CHECK(FreeClassCounter == 0);
    }
    CHECK(FreeClassCounter == 1);
@@ -45799,7 +45799,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
    n2.reset(nullptr);
    CHECK(FreeClassCounter == 2);
    n2.reset(new int);
-@@ -301,35 +301,35 @@ static_assert(sizeof(BDeleterRef) > size
+@@ -299,35 +299,35 @@ static_assert(sizeof(BDeleterRef) > size
                "has to be heavier than a B* to store the reference");
  
  static bool
@@ -45839,7 +45839,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
  TestReferenceDeleter()
  {
    gADestructorCalls = 0;
-@@ -365,17 +365,17 @@ SetMallocedInt(UniquePtr<int, FreeSignat
+@@ -363,17 +363,17 @@ SetMallocedInt(UniquePtr<int, FreeSignat
  }
  
  static UniquePtr<int, FreeSignature>
@@ -45858,7 +45858,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
    UniquePtr<int, FreeSignature> i1(MallocedInt(17));
    CHECK(*i1 == 17);
  
-@@ -470,17 +470,17 @@ TestArray()
+@@ -468,17 +468,17 @@ TestArray()
  
    n1 = nullptr;
    CHECK(!n1);
@@ -45877,7 +45877,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
    CHECK(n1.get() == p1);
    CHECK(n2.get() == nullptr);
  
-@@ -498,19 +498,19 @@ TestArray()
+@@ -496,19 +496,19 @@ TestArray()
    n2.reset(p3);
    CHECK(n1.get() == p2);
    CHECK(n2.get() == p3);
@@ -45899,25 +45899,6 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
  
    UniquePtr<A[]> a2(new A[5], DefaultDelete<A[]>());
    a2.reset(nullptr);
-@@ -575,17 +575,17 @@ TestVoid()
-   auto x = p1.get();
-   CHECK(x != nullptr);
-   CHECK((IsSame<decltype(x), void*>::value));
- 
-   p2.reset(p1.release());
-   CHECK(p1.get() == nullptr);
-   CHECK(p2.get() != nullptr);
- 
--  p1 = Move(p2);
-+  p1 = std::move(p2);
-   CHECK(p1);
-   CHECK(!p2);
- 
-   p1.swap(p2);
-   CHECK(!p1);
-   CHECK(p2);
- 
-   p2 = nullptr;
 diff --git a/mfbt/tests/TestVariant.cpp b/mfbt/tests/TestVariant.cpp
 --- a/mfbt/tests/TestVariant.cpp
 +++ b/mfbt/tests/TestVariant.cpp
@@ -46309,8 +46290,7 @@ diff --git a/mozglue/misc/interceptor/PatcherBase.h b/mozglue/misc/interceptor/P
 diff --git a/mozglue/misc/interceptor/TargetFunction.h b/mozglue/misc/interceptor/TargetFunction.h
 --- a/mozglue/misc/interceptor/TargetFunction.h
 +++ b/mozglue/misc/interceptor/TargetFunction.h
-@@ -135,17 +135,17 @@ public:
-   }
+@@ -51,17 +51,17 @@ public:
  
    WritableTargetFunction(WritableTargetFunction&& aOther)
      : mMMPolicy(aOther.mMMPolicy)
@@ -46318,17 +46298,18 @@ diff --git a/mozglue/misc/interceptor/TargetFunction.h b/mozglue/misc/intercepto
      , mNumBytes(aOther.mNumBytes)
      , mOffset(aOther.mOffset)
      , mStartWriteOffset(aOther.mStartWriteOffset)
+     , mPrevProt(aOther.mPrevProt)
 -    , mLocalBytes(Move(aOther.mLocalBytes))
 +    , mLocalBytes(std::move(aOther.mLocalBytes))
      , mAccumulatedStatus(aOther.mAccumulatedStatus)
-     , mProtect(std::move(aOther.mProtect))
    {
+     aOther.mPrevProt = 0;
      aOther.mAccumulatedStatus = false;
    }
  
    ~WritableTargetFunction()
    {
-@@ -411,17 +411,17 @@ public:
+@@ -335,17 +335,17 @@ public:
    ReadOnlyTargetBytes(const MMPolicyOutOfProcess& aMMPolicy, const void* aBase)
      : mMMPolicy(aMMPolicy)
      , mBase(reinterpret_cast<const uint8_t*>(aBase))
@@ -46347,7 +46328,7 @@ diff --git a/mozglue/misc/interceptor/TargetFunction.h b/mozglue/misc/intercepto
      : mMMPolicy(aOther.mMMPolicy)
      , mBase(aOther.mBase)
    {
-@@ -630,17 +630,17 @@ public:
+@@ -554,17 +554,17 @@ public:
    ReadOnlyTargetFunction(const MMPolicy& aMMPolicy, uintptr_t aFunc)
      : mTargetBytes(TargetBytesPtr<MMPolicy>::Make(aMMPolicy,
          reinterpret_cast<const void*>(aFunc)))
@@ -46366,7 +46347,7 @@ diff --git a/mozglue/misc/interceptor/TargetFunction.h b/mozglue/misc/intercepto
    ReadOnlyTargetFunction& operator=(ReadOnlyTargetFunction&&) = delete;
  
    ~ReadOnlyTargetFunction() = default;
-@@ -738,17 +738,17 @@ public:
+@@ -662,17 +662,17 @@ public:
        return WritableTargetFunction<MMPolicy>(mTargetBytes->GetMMPolicy());
      }
  
@@ -48454,7 +48435,7 @@ diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNS
  }
  
  static const char* kEnterpriseRootModePref = "security.enterprise_roots.enabled";
-@@ -1198,17 +1198,17 @@ nsNSSComponent::CheckForSmartCardChanges
+@@ -1179,17 +1179,17 @@ nsNSSComponent::CheckForSmartCardChanges
    // there's no thread safety concern here.
    Vector<UniqueSECMODModule> modulesWithRemovableSlots;
    {
@@ -48473,7 +48454,7 @@ diff --git a/security/manager/ssl/nsNSSComponent.cpp b/security/manager/ssl/nsNS
    }
    for (auto& module : modulesWithRemovableSlots) {
      // Best-effort.
-@@ -1303,48 +1303,48 @@ LoadLoadableRootsTask::LoadLoadableRoots
+@@ -1284,48 +1284,48 @@ LoadLoadableRootsTask::LoadLoadableRoots
    NS_ConvertUTF16toUTF8 modNameUTF8(modName);
  
    Vector<nsCString> possibleCKBILocations;

mozilla-release/patches/1466909-62a1.patch

@@ -2,7 +2,7 @@
 # User Andre Bargull <andre.bargull@gmail.com>
 # Date 1528381642 25200
 # Node ID 17b140524c6ee9e1263175212dec5231bfe3059f
-# Parent  111a31187759d03646830630d24b4a2566c0c08c
+# Parent  7d4f0f92e41372616ab58087c70d6f703d924845
 Bug 1466909 - Use AddLvalueReference for UniquePtr's operator*(). r=froydnj
 
 diff --git a/mfbt/UniquePtr.h b/mfbt/UniquePtr.h
@@ -83,7 +83,7 @@ diff --git a/mfbt/tests/TestUniquePtr.cpp b/mfbt/tests/TestUniquePtr.cpp
 +  CHECK(p1.get() == nullptr);
 +  CHECK(p2.get() != nullptr);
 +
-+  p1 = Move(p2);
++  p1 = std::move(p2);
 +  CHECK(p1);
 +  CHECK(!p2);
 +

mozilla-release/patches/series

@@ -3017,7 +3017,9 @@ NOBUG-20180505-lint-61a1.patch
 1465807-62a1.patch
 1463961-62a1.patch
 1444597-62a1.patch
+1465585-1-std-62a1.patch
 1465585-2-62a1.patch
+1465585-3-std-62a1.patch
 1459274-62a1.patch
 1464680-62a1.patch
 1463581-2-62a1.patch
@@ -3030,6 +3032,7 @@ NOBUG-20180505-lint-61a1.patch
 1466008-2-62a1.patch
 1466095-62a1.patch
 1463596-62a1.patch
+1465585-4-std-62a1.patch
 1270217-62a1.patch
 1463834-62a1.patch
 1466060-62a1.patch
@@ -3039,6 +3042,8 @@ NOBUG-20180505-lint-61a1.patch
 1466054-2-62a1.patch
 1465996-62a1.patch
 1464773-62a1.patch
+1465060-1-std-62a1.patch
+1465060-2-std-62a1.patch
 1465836-62a1.patch
 1466789-1-62a1.patch
 1466789-2-62a1.patch
@@ -3097,11 +3102,6 @@ NOBUG-20180505-lint-61a1.patch
 1443722-2-62a1.patch
 1467183-62a1.patch
 1444734-62a1.patch
-1465585-1-std-62a1.patch
-1465585-3-std-62a1.patch
-1465585-4-std-62a1.patch
-1465060-1-std-62a1.patch
-1465060-2-std-62a1.patch
 1465709-2-62a1.patch
 1468811-1-62a1.patch
 1468811-2-62a1.patch