Remove MediaControls::showVolumeSlider()

Source/core/html/shadow/MediaControlElements.cpp

 /*
  * Copyright (C) 2008, 2009, 2010, 2011 Apple Inc. All rights reserved.
  * Copyright (C) 2012 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.
@@ skipping 266 matching lines @@
 }
 
 const AtomicString& MediaControlOverlayEnclosureElement::shadowPseudoId() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-overlay-enclosure", AtomicString::ConstructFromLiteral));
     return id;
 }
 
 // ----------------------------
 
 MediaControlPanelMuteButtonElement::MediaControlPanelMuteButtonElement(Document& document, MediaControls* controls)

[acolwell GONE FROM CHROMIUM, 2014/03/04 02:06:58]

Do we even need this class anymore? It appears that this is the only subclass of
MediaControlMuteButtonElement. Any reason we shouldn't just move the remaining
code into that class?

[philipj_slow, 2014/03/04 08:10:16]

Sorry, I noticed the same thing and should have pointed it out in the commit
message. MediaControlVolumeSliderElement can also be merged, so I've merged both
as a separate CL that depends on this and the other recent controls changes:
https://codereview.chromium.org/185363011/

     : MediaControlMuteButtonElement(document, MediaMuteButton)
-    , m_controls(controls)
 {
 }
 
 PassRefPtr<MediaControlPanelMuteButtonElement> MediaControlPanelMuteButtonElement::create(Document& document, MediaControls* controls)
 {
     ASSERT(controls);
 
     RefPtr<MediaControlPanelMuteButtonElement> button = adoptRef(new MediaControlPanelMuteButtonElement(document, controls));
     button->ensureUserAgentShadowRoot();
     button->setType("button");
     return button.release();
 }
 
-void MediaControlPanelMuteButtonElement::defaultEventHandler(Event* event)
-{
-    if (event->type() == EventTypeNames::mouseover)

[acolwell GONE FROM CHROMIUM, 2014/03/04 23:23:17]

We don't need this now because the slider is always already visible when this
button is visible?

[philipj_slow, 2014/03/05 07:22:16]

showVolumeSlider() simply shows the slider if (m_mediaController->hasAudio()),
but MediaControls::reset() already does exactly that. I haven't dug deep in the
WebKit history, but this looks like it would show a vertical slider which would
then be hidden on some mouseout event, but that code doesn't exist anymore, the
slider is part of the main panel...

Note that because of MediaController this wasn't 100% dead code, you could have
a case where there's initially no audio but adding another media element to the
controller causes there to be. In that case hovering the mute button ought to
cause the volume slider to become visible. However, I doubt anyone had thought
of that, because the sane thing to do would be do call reset() when the
MediaController changes in some way. (I'm still trying to figure out everything
that is broken about MediaController in combination with MediaControls, this is
far from the only problem.)

-        m_controls->showVolumeSlider();
-
-    MediaControlMuteButtonElement::defaultEventHandler(event);
-}
-
 const AtomicString& MediaControlPanelMuteButtonElement::shadowPseudoId() const
 {
     DEFINE_STATIC_LOCAL(AtomicString, id, ("-webkit-media-controls-mute-button", AtomicString::ConstructFromLiteral));
     return id;
 }
 
 // ----------------------------
 
 MediaControlPlayButtonElement::MediaControlPlayButtonElement(Document& document)
     : MediaControlInputElement(document, MediaPlayButton)
@@ skipping 425 matching lines @@
     float fontSize = smallestDimension * 0.05f;
     if (fontSize != m_fontSize) {
         m_fontSize = fontSize;
         setInlineStyleProperty(CSSPropertyFontSize, fontSize, CSSPrimitiveValue::CSS_PX);
     }
 }
 
 // ----------------------------
 
 } // namespace WebCore