Commit f2c52f13 authored by philipj@opera.com's avatar philipj@opera.com

Remove MediaControlVolumeSliderElement::m_clearMutedOnUserInteraction

It is always set to true.

Also drop the volume change check, since HTMLMediaElement::setVolume()
and MediaController::setVolume() already do that.

BUG=341813

Review URL: https://codereview.chromium.org/177423011

git-svn-id: svn://svn.chromium.org/blink/trunk@168438 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 5c3f7e06
...@@ -157,7 +157,6 @@ void MediaControlMuteButtonElement::updateDisplayType() ...@@ -157,7 +157,6 @@ void MediaControlMuteButtonElement::updateDisplayType()
MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(Document& document) MediaControlVolumeSliderElement::MediaControlVolumeSliderElement(Document& document)
: MediaControlInputElement(document, MediaVolumeSlider) : MediaControlInputElement(document, MediaVolumeSlider)
, m_clearMutedOnUserInteraction(false)
{ {
} }
...@@ -176,9 +175,7 @@ void MediaControlVolumeSliderElement::defaultEventHandler(Event* event) ...@@ -176,9 +175,7 @@ void MediaControlVolumeSliderElement::defaultEventHandler(Event* event)
return; return;
double volume = value().toDouble(); double volume = value().toDouble();
if (volume != mediaController()->volume())
mediaController()->setVolume(volume, ASSERT_NO_EXCEPTION); mediaController()->setVolume(volume, ASSERT_NO_EXCEPTION);
if (m_clearMutedOnUserInteraction)
mediaController()->setMuted(false); mediaController()->setMuted(false);
} }
...@@ -204,9 +201,4 @@ void MediaControlVolumeSliderElement::setVolume(double volume) ...@@ -204,9 +201,4 @@ void MediaControlVolumeSliderElement::setVolume(double volume)
setValue(String::number(volume)); setValue(String::number(volume));
} }
void MediaControlVolumeSliderElement::setClearMutedOnUserInteraction(bool clearMute)
{
m_clearMutedOnUserInteraction = clearMute;
}
} // namespace WebCore } // namespace WebCore
...@@ -151,15 +151,11 @@ public: ...@@ -151,15 +151,11 @@ public:
virtual bool willRespondToMouseMoveEvents() OVERRIDE; virtual bool willRespondToMouseMoveEvents() OVERRIDE;
virtual bool willRespondToMouseClickEvents() OVERRIDE; virtual bool willRespondToMouseClickEvents() OVERRIDE;
void setVolume(double); void setVolume(double);
void setClearMutedOnUserInteraction(bool);
protected: protected:
explicit MediaControlVolumeSliderElement(Document&); explicit MediaControlVolumeSliderElement(Document&);
virtual void defaultEventHandler(Event*) OVERRIDE; virtual void defaultEventHandler(Event*) OVERRIDE;
private:
bool m_clearMutedOnUserInteraction;
}; };
} // namespace WebCore } // namespace WebCore
......
...@@ -116,7 +116,6 @@ bool MediaControls::initializeControls(Document& document) ...@@ -116,7 +116,6 @@ bool MediaControls::initializeControls(Document& document)
RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolumeSliderElement::create(document); RefPtr<MediaControlPanelVolumeSliderElement> slider = MediaControlPanelVolumeSliderElement::create(document);
m_volumeSlider = slider.get(); m_volumeSlider = slider.get();
m_volumeSlider->setClearMutedOnUserInteraction(true);
panel->appendChild(slider.release(), exceptionState); panel->appendChild(slider.release(), exceptionState);
if (exceptionState.hadException()) if (exceptionState.hadException())
return false; return false;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment