Merge 84611 - <rdar://problem/9322486> REGRESSION (r83397): Default controls fade out when playin...

Source/WebCore/html/HTMLMediaElement.cpp

 /*
  * Copyright (C) 2007, 2008, 2009, 2010, 2011 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 1597 matching lines @@
 }
 
 void HTMLMediaElement::playbackProgressTimerFired(Timer<HTMLMediaElement>*)
 {
     ASSERT(m_player);
     if (!m_playbackRate)
         return;
 
     scheduleTimeupdateEvent(true);
     if (hasMediaControls()) {
-        if (!m_mouseOver && controls())
+        if (!m_mouseOver && controls() && hasVideo())
             mediaControls()->makeTransparent();
         mediaControls()->playbackProgressed();
     }
     // FIXME: deal with cue ranges here
 }
 
 void HTMLMediaElement::scheduleTimeupdateEvent(bool periodicEvent)
 {
     double now = WTF::currentTime();
     double timedelta = now - m_lastTimeUpdateEventWallTime;
@@ skipping 1060 matching lines @@
         } else if (hasMediaControls())
             mediaControls()->hide();
     }
     return 0;
 }
 
 
 }
 
 #endif