Add TextTrack::isVisualKind helper

third_party/WebKit/Source/core/html/track/TextTrack.cpp

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2011, 2012, 2013 Apple Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
@@ skipping 120 matching lines @@
 
 void TextTrack::setTrackList(TextTrackList* trackList)
 {
     if (!trackList && cueTimeline() && m_cues)
         cueTimeline()->removeCues(this, m_cues.get());
 
     m_trackList = trackList;
     invalidateTrackIndex();
 }
 
+bool TextTrack::isVisualKind() const
+{
+    return kind() == subtitlesKeyword() || kind() == captionsKeyword();
+}
+
 void TextTrack::setKind(const AtomicString& newKind)
 {
     AtomicString oldKind = kind();
     TrackBase::setKind(newKind);
 
     // If kind changes from visual to non-visual and mode is 'showing', then force mode to 'hidden'.
     // FIXME: This is not per spec. crbug.com/460923
-    if (oldKind != kind() && mode() == showingKeyword()) {
-        if (kind() != captionsKeyword() && kind() != subtitlesKeyword())
-            setMode(hiddenKeyword());
-    }
+    if (oldKind != kind() && mode() == showingKeyword() && !isVisualKind())
+        setMode(hiddenKeyword());
 }
 
 void TextTrack::setMode(const AtomicString& mode)
 {
     ASSERT(mode == disabledKeyword() || mode == hiddenKeyword() || mode == showingKeyword());
 
     // On setting, if the new value isn't equal to what the attribute would currently
     // return, the new value must be processed as follows ...
     if (m_mode == mode)
         return;
@@ skipping 247 matching lines @@
 }
 
 void TextTrack::invalidateTrackIndex()
 {
     m_trackIndex = invalidTrackIndex;
     m_renderedTrackIndex = invalidTrackIndex;
 }
 
 bool TextTrack::isRendered() const
 {
-    if (kind() != captionsKeyword() && kind() != subtitlesKeyword())
-        return false;
-
-    if (m_mode != showingKeyword())
-        return false;
-
-    return true;
+    return m_mode == showingKeyword() && isVisualKind();
 }
 
 bool TextTrack::canBeRendered() const
 {
     // A track can be displayed when it's of kind captions or subtitles and hasn't failed to load.
-    if (kind() != captionsKeyword() && kind() != subtitlesKeyword())
-        return false;
-
-    if (getReadinessState() == FailedToLoad)
-        return false;
-
-    return true;
+    return getReadinessState() != FailedToLoad && isVisualKind();
 }
 
 TextTrackCueList* TextTrack::ensureTextTrackCueList()
 {
     if (!m_cues)
         m_cues = TextTrackCueList::create();
 
     return m_cues.get();
 }
 
@@ skipping 41 matching lines @@
     visitor->trace(m_trackList);
     TrackBase::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 DEFINE_TRACE_WRAPPERS(TextTrack)
 {
     visitor->traceWrappers(m_cues);
 }
 } // namespace blink