Merge 91337 - [chromium] Media player controls do not fade out.

Source/WebCore/html/shadow/MediaControlRootElementChromium.h

 /*
  * 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 71 matching lines @@
 
     void showVolumeSlider();
     void updateTimeDisplay();
     void updateStatusDisplay();
 
     virtual bool shouldHideControls();
 
 private:
     MediaControlRootElementChromium(HTMLMediaElement*);
 
+    virtual void defaultEventHandler(Event*);
+
     virtual const AtomicString& shadowPseudoId() const;
 
+    bool containsRelatedTarget(Event*);
+
     HTMLMediaElement* m_mediaElement;
 
     MediaControlPlayButtonElement* m_playButton;
     MediaControlCurrentTimeDisplayElement* m_currentTimeDisplay;
     MediaControlTimelineElement* m_timeline;
     MediaControlTimelineContainerElement* m_timelineContainer;
     MediaControlPanelMuteButtonElement* m_panelMuteButton;
     MediaControlVolumeSliderElement* m_volumeSlider;
     MediaControlVolumeSliderContainerElement* m_volumeSliderContainer;
     MediaControlPanelElement* m_panel;
 
     bool m_opaque;
+    bool m_isMouseOverControls;
 };
 
 }
 
 #endif
 
 #endif