Remove HTMLMediaElement::setPausedInternal()

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 327 matching lines @@
     , m_playing(false)
     , m_shouldDelayLoadEvent(false)
     , m_haveFiredLoadedData(false)
     , m_active(true)
     , m_autoplaying(true)
     , m_muted(false)
     , m_paused(true)
     , m_seeking(false)
     , m_sentStalledEvent(false)
     , m_sentEndEvent(false)
-    , m_pausedInternal(false)
     , m_closedCaptionsVisible(false)
     , m_completelyLoaded(false)
     , m_havePreparedToPlay(false)
     , m_tracksAreReady(true)
     , m_haveVisibleTextTrack(false)
     , m_processingPreferenceChange(false)
     , m_remoteRoutesAvailable(false)
     , m_playingRemotely(false)
 #if ENABLE(OILPAN)
     , m_isFinalizing(false)
@@ skipping 2824 matching lines @@
         renderer()->updateFromElement();
 
     if (requestSeek)
         seek(duration);
 }
 
 void HTMLMediaElement::mediaPlayerPlaybackStateChanged()
 {
     WTF_LOG(Media, "HTMLMediaElement::mediaPlayerPlaybackStateChanged(%p)", this);
 
-    if (!m_player || m_pausedInternal)
+    if (!webMediaPlayer())
         return;
 
     if (webMediaPlayer()->paused())
         pause();
     else
         playInternal();
 }
 
 void HTMLMediaElement::mediaPlayerRequestFullscreen()
 {
@@ skipping 145 matching lines @@
 
     return false;
 }
 
 void HTMLMediaElement::updatePlayState()
 {
     if (!m_player)
         return;
 
     bool isPlaying = webMediaPlayer() && !webMediaPlayer()->paused();
-    if (m_pausedInternal) {
-        if (isPlaying)
-            webMediaPlayer()->pause();
-        refreshCachedTime();
-        m_playbackProgressTimer.stop();
-        if (hasMediaControls())
-            mediaControls()->playbackStopped();
-        return;
-    }
-
     bool shouldBePlaying = potentiallyPlaying();
 
     WTF_LOG(Media, "HTMLMediaElement::updatePlayState(%p) - shouldBePlaying = %s, isPlaying = %s",
         this, boolString(shouldBePlaying), boolString(isPlaying));
 
     if (shouldBePlaying) {
         setDisplayMode(Video);
         invalidateCachedTime();
 
         if (!isPlaying) {
@@ skipping 26 matching lines @@
         if (hasMediaControls())
             mediaControls()->playbackStopped();
     }
 
     updateMediaController();
 
     if (renderer())
         renderer()->updateFromElement();
 }
 
-void HTMLMediaElement::setPausedInternal(bool b)
-{
-    m_pausedInternal = b;
-    updatePlayState();
-}
-
 void HTMLMediaElement::stopPeriodicTimers()
 {
     m_progressEventTimer.stop();
     m_playbackProgressTimer.stop();
 }
 
 void HTMLMediaElement::userCancelledLoad()
 {
     WTF_LOG(Media, "HTMLMediaElement::userCancelledLoad(%p)", this);
 
@@ skipping 80 matching lines @@
 {
     WTF_LOG(Media, "HTMLMediaElement::stop(%p)", this);
 
     m_active = false;
     userCancelledLoad();
 
     // Stop the playback without generating events
     m_playing = false;
     m_paused = true;
     m_seeking = false;
-    setPausedInternal(true);
 
     if (renderer())
         renderer()->updateFromElement();
 
     stopPeriodicTimers();
     cancelPendingEventsAndCallbacks();
 
     m_asyncEventQueue->close();
 
     // Ensure that hasPendingActivity() is not preventing garbage collection, since otherwise this
@@ skipping 515 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(0);
 }
 #endif
 
 }