зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset 453431d7a2c8 (bug 882718) for crashing in track.html with nsXBLPrototypeBinding::GetRuleProcessor(). r=backout
This commit is contained in:
Родитель
c13a947fcf
Коммит
5a8c6aa494
|
@ -776,11 +776,6 @@ void HTMLMediaElement::AbortExistingLoads()
|
||||||
ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY);
|
ChangeNetworkState(nsIDOMHTMLMediaElement::NETWORK_EMPTY);
|
||||||
ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING);
|
ChangeReadyState(nsIDOMHTMLMediaElement::HAVE_NOTHING);
|
||||||
|
|
||||||
//TODO: Apply the rules for text track cue rendering Bug 865407
|
|
||||||
if (mTextTrackManager) {
|
|
||||||
mTextTrackManager->GetTextTracks()->SetCuesInactive();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fireTimeUpdate) {
|
if (fireTimeUpdate) {
|
||||||
// Since we destroyed the decoder above, the current playback position
|
// Since we destroyed the decoder above, the current playback position
|
||||||
// will now be reported as 0. The playback position was non-zero when
|
// will now be reported as 0. The playback position was non-zero when
|
||||||
|
|
|
@ -92,10 +92,6 @@ TextTrack::SetMode(TextTrackMode aValue)
|
||||||
{
|
{
|
||||||
if (mMode != aValue) {
|
if (mMode != aValue) {
|
||||||
mMode = aValue;
|
mMode = aValue;
|
||||||
if (aValue == TextTrackMode::Disabled) {
|
|
||||||
SetCuesInactive();
|
|
||||||
//TODO: Apply the rules for text track cue rendering Bug 865407
|
|
||||||
}
|
|
||||||
if (mTextTrackList) {
|
if (mTextTrackList) {
|
||||||
mTextTrackList->CreateAndDispatchChangeEvent();
|
mTextTrackList->CreateAndDispatchChangeEvent();
|
||||||
}
|
}
|
||||||
|
@ -129,9 +125,6 @@ TextTrack::AddCue(TextTrackCue& aCue)
|
||||||
void
|
void
|
||||||
TextTrack::RemoveCue(TextTrackCue& aCue, ErrorResult& aRv)
|
TextTrack::RemoveCue(TextTrackCue& aCue, ErrorResult& aRv)
|
||||||
{
|
{
|
||||||
//TODO: Apply the rules for text track cue rendering Bug 865407
|
|
||||||
aCue.SetActive(false);
|
|
||||||
|
|
||||||
mCueList->RemoveCue(aCue, aRv);
|
mCueList->RemoveCue(aCue, aRv);
|
||||||
SetDirty();
|
SetDirty();
|
||||||
}
|
}
|
||||||
|
@ -270,11 +263,5 @@ TextTrack::SetTrackElement(HTMLTrackElement* aTrackElement) {
|
||||||
mTrackElement = aTrackElement;
|
mTrackElement = aTrackElement;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
TextTrack::SetCuesInactive()
|
|
||||||
{
|
|
||||||
mCueList->SetCuesInactive();
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace dom
|
} // namespace dom
|
||||||
} // namespace mozilla
|
} // namespace mozilla
|
||||||
|
|
|
@ -118,8 +118,6 @@ public:
|
||||||
return mTextTrackSource;
|
return mTextTrackSource;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SetCuesInactive();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
~TextTrack();
|
~TextTrack();
|
||||||
|
|
||||||
|
|
|
@ -41,7 +41,6 @@ TextTrackCue::SetDefaultCueSettings()
|
||||||
mAlign = AlignSetting::Middle;
|
mAlign = AlignSetting::Middle;
|
||||||
mLineAlign = AlignSetting::Start;
|
mLineAlign = AlignSetting::Start;
|
||||||
mVertical = DirectionSetting::_empty;
|
mVertical = DirectionSetting::_empty;
|
||||||
mActive = false;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TextTrackCue::TextTrackCue(nsPIDOMWindowInner* aOwnerWindow,
|
TextTrackCue::TextTrackCue(nsPIDOMWindowInner* aOwnerWindow,
|
||||||
|
|
|
@ -332,16 +332,6 @@ public:
|
||||||
|
|
||||||
void SetTrackElement(HTMLTrackElement* aTrackElement);
|
void SetTrackElement(HTMLTrackElement* aTrackElement);
|
||||||
|
|
||||||
void SetActive(bool aActive)
|
|
||||||
{
|
|
||||||
mActive = aActive;
|
|
||||||
}
|
|
||||||
|
|
||||||
bool GetActive()
|
|
||||||
{
|
|
||||||
return mActive;
|
|
||||||
}
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
~TextTrackCue();
|
~TextTrackCue();
|
||||||
|
|
||||||
|
@ -376,8 +366,6 @@ private:
|
||||||
// changed.
|
// changed.
|
||||||
bool mReset;
|
bool mReset;
|
||||||
|
|
||||||
bool mActive;
|
|
||||||
|
|
||||||
static StaticRefPtr<nsIWebVTTParserWrapper> sParserWrapper;
|
static StaticRefPtr<nsIWebVTTParserWrapper> sParserWrapper;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -117,13 +117,5 @@ TextTrackCueList::GetArray(nsTArray<RefPtr<TextTrackCue> >& aCues)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void
|
|
||||||
TextTrackCueList::SetCuesInactive()
|
|
||||||
{
|
|
||||||
for(uint32_t i = 0; i < mList.Length(); ++i) {
|
|
||||||
mList[i]->SetActive(false);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace dom
|
} // namespace dom
|
||||||
} // namespace mozilla
|
} // namespace mozilla
|
||||||
|
|
|
@ -54,8 +54,6 @@ public:
|
||||||
void RemoveAll();
|
void RemoveAll();
|
||||||
void GetArray(nsTArray<RefPtr<TextTrackCue> >& aCues);
|
void GetArray(nsTArray<RefPtr<TextTrackCue> >& aCues);
|
||||||
|
|
||||||
void SetCuesInactive();
|
|
||||||
|
|
||||||
private:
|
private:
|
||||||
~TextTrackCueList();
|
~TextTrackCueList();
|
||||||
|
|
||||||
|
|
|
@ -211,13 +211,5 @@ TextTrackList::SetTextTrackManager(TextTrackManager* aTextTrackManager)
|
||||||
mTextTrackManager = aTextTrackManager;
|
mTextTrackManager = aTextTrackManager;
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
|
||||||
TextTrackList::SetCuesInactive()
|
|
||||||
{
|
|
||||||
for (uint32_t i = 0; i < Length(); i++) {
|
|
||||||
mTextTracks[i]->SetCuesInactive();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace dom
|
} // namespace dom
|
||||||
} // namespace mozilla
|
} // namespace mozilla
|
||||||
|
|
|
@ -61,7 +61,6 @@ public:
|
||||||
|
|
||||||
nsresult DispatchTrackEvent(nsIDOMEvent* aEvent);
|
nsresult DispatchTrackEvent(nsIDOMEvent* aEvent);
|
||||||
void CreateAndDispatchChangeEvent();
|
void CreateAndDispatchChangeEvent();
|
||||||
void SetCuesInactive();
|
|
||||||
|
|
||||||
IMPL_EVENT_HANDLER(change)
|
IMPL_EVENT_HANDLER(change)
|
||||||
IMPL_EVENT_HANDLER(addtrack)
|
IMPL_EVENT_HANDLER(addtrack)
|
||||||
|
|
Загрузка…
Ссылка в новой задаче