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

third_party/WebKit/Source/core/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 1133 matching lines @@
 }
 
 bool HTMLMediaElement::textTracksAreReady() const
 {
     // 4.8.10.12.1 Text track model
     // ...
     // The text tracks of a media element are ready if all the text tracks whose mode was not
     // in the disabled state when the element's resource selection algorithm last started now
     // have a text track readiness state of loaded or failed to load.
     for (unsigned i = 0; i < m_textTracksWhenResourceSelectionBegan.size(); ++i) {
-        if (m_textTracksWhenResourceSelectionBegan[i]->readinessState() == TextTrack::Loading
-            || m_textTracksWhenResourceSelectionBegan[i]->readinessState() == TextTrack::NotLoaded)
+        if (m_textTracksWhenResourceSelectionBegan[i]->getReadinessState() == TextTrack::Loading
+            || m_textTracksWhenResourceSelectionBegan[i]->getReadinessState() == TextTrack::NotLoaded)
             return false;
     }
 
     return true;
 }
 
 void HTMLMediaElement::textTrackReadyStateChanged(TextTrack* track)
 {
     if (webMediaPlayer()&& m_textTracksWhenResourceSelectionBegan.contains(track)) {
-        if (track->readinessState() != TextTrack::Loading)
-            setReadyState(static_cast<ReadyState>(webMediaPlayer()->readyState()));
+        if (track->getReadinessState() != TextTrack::Loading)
+            setReadyState(static_cast<ReadyState>(webMediaPlayer()->getReadyState()));
     } else {
         // The track readiness state might have changed as a result of the user
         // clicking the captions button. In this case, a check whether all the
         // resources have failed loading should be done in order to hide the CC button.
-        if (mediaControls() && track->readinessState() == TextTrack::FailedToLoad)
+        if (mediaControls() && track->getReadinessState() == TextTrack::FailedToLoad)
             mediaControls()->refreshClosedCaptionsButtonVisibility();
     }
 }
 
 void HTMLMediaElement::textTrackModeChanged(TextTrack* track)
 {
     // Mark this track as "configured" so configureTextTracks won't change the mode again.
     if (track->trackType() == TextTrack::TrackElement)
         track->setHasBeenConfigured(true);
 
@@ skipping 139 matching lines @@
 
     for (HTMLSourceElement* source = Traversal<HTMLSourceElement>::firstChild(*this); source; source = Traversal<HTMLSourceElement>::nextSibling(*source))
         source->cancelPendingErrorEvent();
 
     m_playPromiseResolveTask->cancel();
     m_playPromiseRejectTask->cancel();
 }
 
 void HTMLMediaElement::networkStateChanged()
 {
-    setNetworkState(webMediaPlayer()->networkState());
+    setNetworkState(webMediaPlayer()->getNetworkState());
 }
 
 void HTMLMediaElement::mediaLoadingFailed(WebMediaPlayer::NetworkState error)
 {
     stopPeriodicTimers();
 
     // If we failed while trying to load a <source> element, the movie was never parsed, and there are more
     // <source> children, schedule the next one
     if (m_readyState < HAVE_METADATA && m_loadState == LoadingFromSourceElement) {
 
@@ skipping 79 matching lines @@
     // Schedule one last progress event so we guarantee that at least one is fired
     // for files that load very quickly.
     if (webMediaPlayer() && webMediaPlayer()->didLoadingProgress())
         scheduleEvent(EventTypeNames::progress);
     scheduleEvent(EventTypeNames::suspend);
     setNetworkState(NETWORK_IDLE);
 }
 
 void HTMLMediaElement::readyStateChanged()
 {
-    setReadyState(static_cast<ReadyState>(webMediaPlayer()->readyState()));
+    setReadyState(static_cast<ReadyState>(webMediaPlayer()->getReadyState()));
 }
 
 void HTMLMediaElement::setReadyState(ReadyState state)
 {
     WTF_LOG(Media, "HTMLMediaElement::setReadyState(%p, %d) - current state is %d,", this, static_cast<int>(state), static_cast<int>(m_readyState));
 
     // Set "wasPotentiallyPlaying" BEFORE updating m_readyState, potentiallyPlaying() uses it
     bool wasPotentiallyPlaying = potentiallyPlaying();
 
     ReadyState oldState = m_readyState;
@@ skipping 264 matching lines @@
     scheduleTimeupdateEvent(false);
 
     // 17 - Queue a task to fire a simple event named seeked at the element.
     scheduleEvent(EventTypeNames::seeked);
 
     setDisplayMode(Video);
 
     Platform::current()->recordAction(UserMetricsAction("Media_Seeked"));
 }
 
-HTMLMediaElement::ReadyState HTMLMediaElement::readyState() const
+HTMLMediaElement::ReadyState HTMLMediaElement::getReadyState() const
 {
     return m_readyState;
 }
 
 bool HTMLMediaElement::hasAudio() const
 {
     return webMediaPlayer() && webMediaPlayer()->hasAudio();
 }
 
 bool HTMLMediaElement::seeking() const
@@ skipping 1479 matching lines @@
 WebLayer* HTMLMediaElement::platformLayer() const
 {
     return m_webLayer;
 }
 
 bool HTMLMediaElement::hasClosedCaptions() const
 {
     if (m_textTracks) {
         for (unsigned i = 0; i < m_textTracks->length(); ++i) {
             TextTrack* track = m_textTracks->anonymousIndexedGetter(i);
-            if (track->readinessState() == TextTrack::FailedToLoad)
+            if (track->getReadinessState() == TextTrack::FailedToLoad)
                 continue;
 
             if (track->kind() == TextTrack::captionsKeyword()
                 || track->kind() == TextTrack::subtitlesKeyword())
                 return true;
         }
     }
     return false;
 }
 
@@ skipping 548 matching lines @@
 {
     visitor->trace(m_client);
 }
 
 DEFINE_TRACE(HTMLMediaElement::AudioSourceProviderImpl)
 {
     visitor->trace(m_client);
 }
 
 } // namespace blink