merge mozilla-inbound to mozilla-central. r=merge a=merge
authorSebastian Hengst <archaeopteryx@coole-files.de>
Sun, 29 Oct 2017 12:04:25 +0200
changeset 388884 66f9b72b87297adf712b14be58df13c2333bb3a9
parent 388881 d58c5cb053be123a9ede85cabce3b060c13cf66d (current diff)
parent 388883 5da48a1cd6d684bf431d7766303c8d6ad56380fc (diff)
child 388885 cb109e3b7069fd9fc743559ba6187e22f157addc
child 388889 00596bac1073b90e4bb129e7fc777c3582be1c76
child 388922 3311f58e8915e359437f6ce1e3627667ffe1e882
push id32767
push userarchaeopteryx@coole-files.de
push dateSun, 29 Oct 2017 10:04:51 +0000
treeherdermozilla-central@66f9b72b8729 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmerge, merge
milestone58.0a1
first release with
nightly linux32
66f9b72b8729 / 58.0a1 / 20171029102300 / files
nightly linux64
66f9b72b8729 / 58.0a1 / 20171029102300 / files
nightly mac
66f9b72b8729 / 58.0a1 / 20171029102300 / files
nightly win32
66f9b72b8729 / 58.0a1 / 20171029102300 / files
nightly win64
66f9b72b8729 / 58.0a1 / 20171029102300 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
merge mozilla-inbound to mozilla-central. r=merge a=merge
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -1544,24 +1544,23 @@ MediaDecoder::DumpDebugInfo()
     str += readerStr;
   }
 
   if (!GetStateMachine()) {
     DUMP("%s", str.get());
     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());
     });
 }
 
 RefPtr<MediaDecoder::DebugInfoPromise>
 MediaDecoder::RequestDebugInfo()
 {
   MOZ_DIAGNOSTIC_ASSERT(!IsShutdown());
--- a/js/src/wasm/WasmTypes.h
+++ b/js/src/wasm/WasmTypes.h
@@ -1841,20 +1841,23 @@ class DebugFrame
             bool isDebuggee_ : 1;
             bool prevUpToDate_ : 1;
             bool hasCachedSavedFrame_ : 1;
             bool hasCachedReturnJSValue_ : 1;
         };
         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_;
 
   public:
     Frame& frame() { return frame_; }
     uint32_t funcIndex() const { return funcIndex_; }
     Instance* instance() const { return frame_.instance(); }
     GlobalObject* global() const;