import changes from tenfourfox-history:

- some additional minor optimizations (886b2ce51)
- #465: gc, jsobj, RegExp (07bfa6ed5)
- #465: dom/media/webm, MDSM (2a306d565)
- #477: reorganize and optimize font URL blacklist (51fffd909)
- #469: yep dose hosts for dat adblock yo (233b4e53e)
- whitespace cleanup (29ba7f68c)
- #478: M1434580 M1261175 M1426087 M1426988 (d3411e70e)
- #478: update certs and pins (b89b0fe92)
- whitespace removal (f3c3705fb)
- #478: M1375217 (with M1350752, fixes M1348955) (33ba64fc0)
- closes #479: suppress bogus assert (cafee7fa3)
- #479: mark for future reference (e699487e9)
- values were not endian dependent (crash) (9ed7fdacb)
- further endianness work for font tags (3f509d76d)
- #478: M1416307 M1430557 M1416529 M1324042 M1428947 M1437087 M1440926 M1425520 (8b45eb124)
- #478: M1437507 M1437450 (fccda54f3)
- #478: update certs and pins (033c49d99)
- #478: M1443865 (for our Intel friends if they ever get it working) (82c63992b)
- #469: super duper more hosts for super duper basic adblock (17bae42e3)

dom/media/MediaDecoderStateMachine.cpp

@@ -1131,7 +1131,7 @@ void MediaDecoderStateMachine::MaybeStartPlayback()
   MOZ_ASSERT(mState == DECODER_STATE_DECODING ||
              mState == DECODER_STATE_COMPLETED);
 
-  if (IsPlaying()) {
+  if (MOZ_LIKELY(IsPlaying())) {
     // Logging this case is really spammy - don't do it.
     return;
   }
@@ -2355,7 +2355,7 @@ nsresult MediaDecoderStateMachine::RunStateMachine()
     }
 
     case DECODER_STATE_DECODING: {
-      if (IsDecodingFirstFrame()) {
+      if (MOZ_UNLIKELY(IsDecodingFirstFrame())) {
         // We haven't completed decoding our first frames, we can't start
         // playback yet.
         return NS_OK;
@@ -2535,7 +2535,7 @@ MediaDecoderStateMachine::CheckFrameValidity(VideoData* aData)
   MOZ_ASSERT(OnTaskQueue());
 
   // Update corrupt-frames statistics
-  if (aData->mImage && !aData->mImage->IsValid()) {
+  if (aData->mImage && MOZ_UNLIKELY(!aData->mImage->IsValid())) {
     FrameStatistics& frameStats = *mFrameStats;
     frameStats.NotifyCorruptFrame();
     // If more than 10% of the last 30 frames have been corrupted, then try disabling
@@ -2704,7 +2704,7 @@ MediaDecoderStateMachine::DropAudioUpToSeekTarget(MediaData* aSample)
          audio->mAudioData.get() + (framesToPrune.value() * channels),
          frames * channels * sizeof(AudioDataValue));
   CheckedInt64 duration = FramesToUsecs(frames, mInfo.mAudio.mRate);
-  if (!duration.isValid()) {
+  if (MOZ_UNLIKELY(!duration.isValid())) {
     return NS_ERROR_FAILURE;
   }
   RefPtr<AudioData> data(new AudioData(audio->mOffset,