Rename enums/functions that collide in chromium style in core/html/.

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/html/track/CueTimeline.h"
 
 #include "core/events/Event.h"
 #include "core/html/HTMLMediaElement.h"
 #include "core/html/HTMLTrackElement.h"
 #include "core/html/track/LoadableTextTrack.h"
@@ skipping 132 matching lines @@
 
     // 1 - Let current cues be a list of cues, initialized to contain all the
     // cues of all the hidden, showing, or showing by default text tracks of the
     // media element (not the disabled ones) whose start times are less than or
     // equal to the current playback position and whose end times are greater
     // than the current playback position.
     CueList currentCues;
 
     // The user agent must synchronously unset [the text track cue active] flag
     // whenever ... the media element's readyState is changed back to HAVE_NOTHING.
-    if (mediaElement.readyState() != HTMLMediaElement::HAVE_NOTHING && mediaElement.webMediaPlayer())
+    if (mediaElement.getReadyState() != HTMLMediaElement::HAVE_NOTHING && mediaElement.webMediaPlayer())
         currentCues = m_cueTree.allOverlaps(m_cueTree.createInterval(movieTime, movieTime));
 
     CueList previousCues;
     CueList missedCues;
 
     // 2 - Let other cues be a list of cues, initialized to contain all the cues
     // of hidden, showing, and showing by default text tracks of the media
     // element that are not present in current cues.
     previousCues = m_currentlyActiveCues;
 
@@ skipping 194 matching lines @@
     if (!m_ignoreUpdate)
         updateActiveCues(mediaElement().currentTime());
 }
 
 DEFINE_TRACE(CueTimeline)
 {
     visitor->trace(m_mediaElement);
 }
 
 } // namespace blink