From 560441d9f167e21d1b153fa1740b0780119853c6 Mon Sep 17 00:00:00 2001
From: Rick Eyre <rick.eyre@hotmail.com>
Date: Thu, 13 Mar 2014 13:48:09 -0400
Subject: [PATCH] Bug 983293 - Part 2: Move the READY_STATE enum to Track
 instead of HTMLTrackElement. r=cpearce

This makes more sense as the READY_STATE values in the spec are always
referred to be 'text track readiness states' not HTMLTrackElement
readiness states.
---
 content/html/content/src/HTMLTrackElement.cpp | 2 +-
 content/html/content/src/HTMLTrackElement.h   | 7 -------
 content/html/content/src/TextTrackManager.cpp | 4 ++--
 content/media/TextTrack.cpp                   | 6 +++---
 content/media/TextTrack.h                     | 7 +++++++
 content/media/WebVTTListener.cpp              | 6 +++---
 6 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/content/html/content/src/HTMLTrackElement.cpp b/content/html/content/src/HTMLTrackElement.cpp
index 34160f4902d..8965527490d 100644
--- a/content/html/content/src/HTMLTrackElement.cpp
+++ b/content/html/content/src/HTMLTrackElement.cpp
@@ -317,7 +317,7 @@ uint16_t
 HTMLTrackElement::ReadyState() const
 {
   if (!mTrack) {
-    return READY_STATE_NONE;
+    return TextTrack::READY_STATE_NONE;
   }
 
   return mTrack->ReadyState();
diff --git a/content/html/content/src/HTMLTrackElement.h b/content/html/content/src/HTMLTrackElement.h
index 01e0611ea86..573824ba2a6 100644
--- a/content/html/content/src/HTMLTrackElement.h
+++ b/content/html/content/src/HTMLTrackElement.h
@@ -85,13 +85,6 @@ public:
     SetHTMLBoolAttr(nsGkAtoms::_default, aDefault, aError);
   }
 
-  // Constants for numeric readyState property values.
-  enum {
-    READY_STATE_NONE = 0U,
-    READY_STATE_LOADING = 1U,
-    READY_STATE_LOADED = 2U,
-    READY_STATE_ERROR = 3U
-  };
   uint16_t ReadyState() const;
 
   TextTrack* Track();
diff --git a/content/html/content/src/TextTrackManager.cpp b/content/html/content/src/TextTrackManager.cpp
index d157712e409..0e0bd8d3bd5 100644
--- a/content/html/content/src/TextTrackManager.cpp
+++ b/content/html/content/src/TextTrackManager.cpp
@@ -121,7 +121,7 @@ TextTrackManager::AddTextTrack(TextTrackKind aKind, const nsAString& aLabel,
   nsRefPtr<TextTrack> ttrack =
     mTextTracks->AddTextTrack(aKind, aLabel, aLanguage, aMode, aTextTrackSource,
                               CompareTextTracks(mMediaElement));
-  ttrack->SetReadyState(HTMLTrackElement::READY_STATE_LOADED);
+  ttrack->SetReadyState(TextTrack::READY_STATE_LOADED);
   AddCues(ttrack);
   return ttrack.forget();
 }
@@ -218,7 +218,7 @@ TextTrackManager::PopulatePendingList()
   for (uint32_t index = 0; index < len; ++index) {
     TextTrack* ttrack = mTextTracks->IndexedGetter(index, dummy);
     if (ttrack && ttrack->Mode() != TextTrackMode::Disabled &&
-        ttrack->ReadyState() == HTMLTrackElement::READY_STATE_LOADING) {
+        ttrack->ReadyState() == TextTrack::READY_STATE_LOADING) {
       mPendingTextTracks->AddTextTrack(ttrack,
                                        CompareTextTracks(mMediaElement));
     }
diff --git a/content/media/TextTrack.cpp b/content/media/TextTrack.cpp
index 8cdda978b8a..c636ee80124 100644
--- a/content/media/TextTrack.cpp
+++ b/content/media/TextTrack.cpp
@@ -74,7 +74,7 @@ TextTrack::SetDefaultSettings()
   mActiveCueList = new TextTrackCueList(mParent);
   mCuePos = 0;
   mDirty = false;
-  mReadyState = HTMLTrackElement::READY_STATE_NONE;
+  mReadyState = TextTrack::READY_STATE_NONE;
 }
 
 JSObject*
@@ -195,8 +195,8 @@ TextTrack::SetReadyState(uint16_t aState)
   }
 
   HTMLMediaElement* mediaElement = mTextTrackList->GetMediaElement();
-  if (mediaElement && (mReadyState == HTMLTrackElement::READY_STATE_LOADED ||
-      mReadyState == HTMLTrackElement::READY_STATE_ERROR)) {
+  if (mediaElement && (mReadyState == TextTrack::READY_STATE_LOADED ||
+      mReadyState == TextTrack::READY_STATE_ERROR)) {
     mediaElement->RemoveTextTrack(this, true);
   }
 }
diff --git a/content/media/TextTrack.h b/content/media/TextTrack.h
index d9532b1d33e..c0f8e9002d4 100644
--- a/content/media/TextTrack.h
+++ b/content/media/TextTrack.h
@@ -96,6 +96,13 @@ public:
   TextTrackCueList* GetActiveCues();
   void GetActiveCueArray(nsTArray<nsRefPtr<TextTrackCue> >& aCues);
 
+  // Constants for numeric readyState property values.
+  enum {
+    READY_STATE_NONE = 0U,
+    READY_STATE_LOADING = 1U,
+    READY_STATE_LOADED = 2U,
+    READY_STATE_ERROR = 3U
+  };
   uint16_t ReadyState() const;
   void SetReadyState(uint16_t aState);
 
diff --git a/content/media/WebVTTListener.cpp b/content/media/WebVTTListener.cpp
index cb495e3713a..88ae600d0fb 100644
--- a/content/media/WebVTTListener.cpp
+++ b/content/media/WebVTTListener.cpp
@@ -78,7 +78,7 @@ WebVTTListener::LoadResource()
   rv = mParserWrapper->Watch(this);
   NS_ENSURE_SUCCESS(rv, rv);
 
-  mElement->mTrack->SetReadyState(HTMLTrackElement::READY_STATE_LOADING);
+  mElement->mTrack->SetReadyState(TextTrack::READY_STATE_LOADING);
   return NS_OK;
 }
 
@@ -106,9 +106,9 @@ WebVTTListener::OnStopRequest(nsIRequest* aRequest,
                               nsISupports* aContext,
                               nsresult aStatus)
 {
-  if (mElement->ReadyState() != HTMLTrackElement::READY_STATE_ERROR) {
+  if (mElement->ReadyState() != TextTrack::READY_STATE_ERROR) {
     TextTrack* track = mElement->Track();
-    track->SetReadyState(HTMLTrackElement::READY_STATE_LOADED);
+    track->SetReadyState(TextTrack::READY_STATE_LOADED);
   }
   // Attempt to parse any final data the parser might still have.
   mParserWrapper->Flush();