Simplify calls to HTMLMediaElement::createMediaControls()

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 3534 matching lines @@
 
 bool HTMLMediaElement::closedCaptionsVisible() const
 {
     return m_closedCaptionsVisible;
 }
 
 void HTMLMediaElement::updateTextTrackDisplay()
 {
     WTF_LOG(Media, "HTMLMediaElement::updateTextTrackDisplay");
 
-    if (!hasMediaControls() && !createMediaControls())
+    if (!createMediaControls())
         return;
 
     mediaControls()->updateTextTrackDisplay();
 }
 
 void HTMLMediaElement::setClosedCaptionsVisible(bool closedCaptionVisible)
 {
     WTF_LOG(Media, "HTMLMediaElement::setClosedCaptionsVisible(%s)", boolString(closedCaptionVisible));
 
     if (!m_player || !hasClosedCaptions())
@@ skipping 80 matching lines @@
 }
 
 void HTMLMediaElement::configureMediaControls()
 {
     if (!shouldShowControls() || !inDocument()) {
         if (hasMediaControls())
             mediaControls()->hide();
         return;
     }
 
-    if (!hasMediaControls() && !createMediaControls())
+    if (!createMediaControls())
         return;
 
     mediaControls()->reset();
     mediaControls()->show();
 }
 
 void HTMLMediaElement::configureTextTrackDisplay(VisibilityChangeAssumption assumption)
 {
     ASSERT(m_textTracks);
     WTF_LOG(Media, "HTMLMediaElement::configureTextTrackDisplay");
@@ skipping 12 matching lines @@
     if (assumption == AssumeNoVisibleChange
         && m_haveVisibleTextTrack == haveVisibleTextTrack) {
         updateActiveTextTrackCues(currentTime());
         return;
     }
     m_haveVisibleTextTrack = haveVisibleTextTrack;
     m_closedCaptionsVisible = m_haveVisibleTextTrack;
 
     if (!m_haveVisibleTextTrack && !hasMediaControls())
         return;
-    if (!hasMediaControls() && !createMediaControls())
+    if (!createMediaControls())
         return;
 
     mediaControls()->changedClosedCaptionsVisibility();
 
     updateActiveTextTrackCues(currentTime());
     updateTextTrackDisplay();
 }
 
 void HTMLMediaElement::markCaptionAndSubtitleTracksAsUnconfigured()
 {
@@ skipping 289 matching lines @@
 
 #if ENABLE(WEB_AUDIO)
 void HTMLMediaElement::clearWeakMembers(Visitor* visitor)
 {
     if (!visitor->isAlive(m_audioSourceNode) && audioSourceProvider())
         audioSourceProvider()->setClient(0);
 }
 #endif
 
 }