merge mozilla-inbound to mozilla-central. r=merge a=merge

dom/media/MediaDecoder.cpp

@@ -1549,14 +1549,13 @@ MediaDecoder::DumpDebugInfo()
     return;
   }
 
-  RefPtr<MediaDecoder> self = this;
   GetStateMachine()->RequestDebugInfo()->Then(
     SystemGroup::AbstractMainThreadFor(TaskCategory::Other), __func__,
-    [this, self, str] (const nsACString& aString) {
+    [str] (const nsACString& aString) {
       DUMP("%s", str.get());
       DUMP("%s", aString.Data());
     },
-    [this, self, str] () {
+    [str] () {
       DUMP("%s", str.get());
     });
 }

js/src/wasm/WasmTypes.h

@@ -1846,10 +1846,13 @@ class DebugFrame
         void* flagsWord_;
     };
 
+    // Avoid -Wunused-private-field warnings.
+  protected:
 #if JS_BITS_PER_WORD == 32
     uint32_t padding_;  // See alignmentStaticAsserts().
 #endif
 
+  private:
     // The Frame goes at the end since the stack grows down.
     Frame frame_;