From f4ec5c59a1fbc6a435b91cb0074f2edc384e08ff Mon Sep 17 00:00:00 2001
From: JW Wang <jwwang@mozilla.com>
Date: Wed, 2 Nov 2016 16:47:51 +0800
Subject: [PATCH] Bug 1314535. Part 2 - remove unused canonical. r=jya

MozReview-Commit-ID: CLLYtFHsYBc

--HG--
extra : rebase_source : e0f23f918114e70650827adc1db1c44d25d6b4e7
extra : source : 96806600d1c65ae1f236588e8917851d2429783e
---
 dom/media/MediaDecoder.cpp | 1 -
 dom/media/MediaDecoder.h   | 9 +++------
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/dom/media/MediaDecoder.cpp b/dom/media/MediaDecoder.cpp
index 6e7ef6888ac3..b74fda690f14 100644
--- a/dom/media/MediaDecoder.cpp
+++ b/dom/media/MediaDecoder.cpp
@@ -397,7 +397,6 @@ MediaDecoder::MediaDecoder(MediaDecoderOwner* aOwner)
   , INIT_CANONICAL(mPlaybackBytesPerSecond, 0.0)
   , INIT_CANONICAL(mPlaybackRateReliable, true)
   , INIT_CANONICAL(mDecoderPosition, 0)
-  , INIT_CANONICAL(mMediaSeekable, true)
   , INIT_CANONICAL(mMediaSeekableOnlyInBufferedRanges, false)
   , INIT_CANONICAL(mIsVisible, !aOwner->IsHidden())
   , mTelemetryReported(false)
diff --git a/dom/media/MediaDecoder.h b/dom/media/MediaDecoder.h
index 92d8902149f4..ce146e4daebe 100644
--- a/dom/media/MediaDecoder.h
+++ b/dom/media/MediaDecoder.h
@@ -666,6 +666,9 @@ protected:
   // True if we've already fired metadataloaded.
   bool mFiredMetadataLoaded;
 
+  // True if the media is seekable (i.e. supports random access).
+  bool mMediaSeekable = true;
+
   // Stores media info, including info of audio tracks and video tracks, should
   // only be accessed from main thread.
   nsAutoPtr<MediaInfo> mInfo;
@@ -765,9 +768,6 @@ protected:
   // back again.
   Canonical<int64_t> mDecoderPosition;
 
-  // True if the media is seekable (i.e. supports random access).
-  Canonical<bool> mMediaSeekable;
-
   // True if the media is only seekable within its buffered ranges.
   Canonical<bool> mMediaSeekableOnlyInBufferedRanges;
 
@@ -812,9 +812,6 @@ public:
   AbstractCanonical<int64_t>* CanonicalDecoderPosition() {
     return &mDecoderPosition;
   }
-  AbstractCanonical<bool>* CanonicalMediaSeekable() {
-    return &mMediaSeekable;
-  }
   AbstractCanonical<bool>* CanonicalMediaSeekableOnlyInBufferedRanges() {
     return &mMediaSeekableOnlyInBufferedRanges;
   }