Merge 123272 - [chromium] Don't display fullscreen button for video elements not containing video

Source/WebCore/html/shadow/MediaControlRootElementChromium.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010 Apple Inc. All rights reserved.
  * Copyright (C) 2011 Google 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
@@ skipping 234 matching lines @@
     if (m_volumeSlider) {
         if (!m_mediaController->hasAudio())
             m_volumeSlider->hide();
         else {
             m_volumeSlider->show();
             m_volumeSlider->setVolume(m_mediaController->volume());
         }
     }
 
 #if ENABLE(FULLSCREEN_MEDIA_CONTROLS)
-    if (m_mediaController->supportsFullscreen())
+    if (m_mediaController->supportsFullscreen() && m_mediaController->hasVideo())
         m_fullscreenButton->show();
     else
         m_fullscreenButton->hide();
 #endif
 
     makeOpaque();
 }
 
 void MediaControlRootElementChromium::playbackStarted()
 {
@@ skipping 227 matching lines @@
 {
     // We only need to update buffering progress when paused, during normal
     // playback playbackProgressed() will take care of it.
     if (m_mediaController->paused())
         m_timeline->setPosition(m_mediaController->currentTime());
 }
 
 }
 
 #endif