| Index: third_party/WebKit/Source/core/html/HTMLTrackElement.cpp
|
| diff --git a/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp b/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp
|
| index 3b20683c4923926079c1d359f8e1e87957730a4a..3857f5f44661fb0956f2fc1a61801cf2862cfef6 100644
|
| --- a/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp
|
| +++ b/third_party/WebKit/Source/core/html/HTMLTrackElement.cpp
|
| @@ -173,7 +173,7 @@ void HTMLTrackElement::loadTimerFired(Timer<HTMLTrackElement>*)
|
| DVLOG(TRACK_LOG_LEVEL) << "loadTimerFired";
|
|
|
| // 6. [X] Set the text track readiness state to loading.
|
| - setReadyState(LOADING);
|
| + setReadyState(kLoading);
|
|
|
| // 7. [X] Let URL be the track URL of the track element.
|
| KURL url = getNonEmptyURLAttribute(srcAttr);
|
| @@ -265,7 +265,7 @@ void HTMLTrackElement::didCompleteLoad(LoadStatus status)
|
| // If the fetching algorithm does not fail, and the file was successfully processed, then the final task that is
|
| // queued by the networking task source, after it has finished parsing the data, must change the text track
|
| // readiness state to loaded, and fire a simple event named load at the track element.
|
| - setReadyState(LOADED);
|
| + setReadyState(kLoaded);
|
| dispatchEvent(Event::create(EventTypeNames::load));
|
| }
|
|
|
| @@ -299,9 +299,9 @@ void HTMLTrackElement::cueLoadingCompleted(TextTrackLoader* loader, bool loading
|
| }
|
|
|
| // NOTE: The values in the TextTrack::ReadinessState enum must stay in sync with those in HTMLTrackElement::ReadyState.
|
| -static_assert(HTMLTrackElement::NONE == static_cast<HTMLTrackElement::ReadyState>(TextTrack::NotLoaded), "HTMLTrackElement::NONE should be in sync with TextTrack::NotLoaded");
|
| -static_assert(HTMLTrackElement::LOADING == static_cast<HTMLTrackElement::ReadyState>(TextTrack::Loading), "HTMLTrackElement::LOADING should be in sync with TextTrack::Loading");
|
| -static_assert(HTMLTrackElement::LOADED == static_cast<HTMLTrackElement::ReadyState>(TextTrack::Loaded), "HTMLTrackElement::LOADED should be in sync with TextTrack::Loaded");
|
| +static_assert(HTMLTrackElement::kNone == static_cast<HTMLTrackElement::ReadyState>(TextTrack::NotLoaded), "HTMLTrackElement::kNone should be in sync with TextTrack::NotLoaded");
|
| +static_assert(HTMLTrackElement::kLoading == static_cast<HTMLTrackElement::ReadyState>(TextTrack::Loading), "HTMLTrackElement::kLoading should be in sync with TextTrack::Loading");
|
| +static_assert(HTMLTrackElement::kLoaded == static_cast<HTMLTrackElement::ReadyState>(TextTrack::Loaded), "HTMLTrackElement::kLoaded should be in sync with TextTrack::Loaded");
|
| static_assert(HTMLTrackElement::TRACK_ERROR == static_cast<HTMLTrackElement::ReadyState>(TextTrack::FailedToLoad), "HTMLTrackElement::TRACK_ERROR should be in sync with TextTrack::FailedToLoad");
|
|
|
| void HTMLTrackElement::setReadyState(ReadyState state)
|
|
|