Attachment 339715 Details for Bug 185370 – .

[patch] .

webkit_master_volume_control-02.diff (text/plain), 2.00 KB, created by Vivek Arumugam on 2018-05-07 06:56:15 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Vivek Arumugam

Created: 2018-05-07 06:56:15 PDT

Size: 2.00 KB

patch

obsolete

>diff --git a/Source/WebCore/html/HTMLMediaElement.cpp b/Source/WebCore/html/HTMLMediaElement.cpp
>index 96cf8b9b14a..ae155fb8c4c 100644
>--- a/Source/WebCore/html/HTMLMediaElement.cpp
>+++ b/Source/WebCore/html/HTMLMediaElement.cpp
>@@ -3648,6 +3648,7 @@ ExceptionOr<void> HTMLMediaElement::setVolume(double volume)
>         removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
> 
>     m_volume = volume;
>+    m_referenceVolume = m_volume;
>     m_volumeInitialized = true;
>     updateVolume();
>     scheduleEvent(eventNames().volumechangeEvent);
>@@ -4814,6 +4815,9 @@ void HTMLMediaElement::mediaPlayerVolumeChanged(MediaPlayer*)
>         double vol = m_player->volume();
>         if (vol != m_volume) {
>             m_volume = vol;
>+            Page* page = document().page();
>+            if (!page || page->mediaVolume() == 1)
>+                m_referenceVolume = vol;
>             updateVolume();
>             scheduleEvent(eventNames().volumechangeEvent);
>         }
>@@ -5216,6 +5220,7 @@ void HTMLMediaElement::updateVolume()
>     float volume = m_player->volume();
>     if (m_volume != volume) {
>         m_volume = volume;
>+        m_referenceVolume = volume;
>         scheduleEvent(eventNames().volumechangeEvent);
>     }
> #else
>@@ -5236,7 +5241,7 @@ void HTMLMediaElement::updateVolume()
> #endif
> 
>         m_player->setMuted(shouldMute);
>-        m_player->setVolume(m_volume * volumeMultiplier);
>+        m_player->setVolume(m_referenceVolume * volumeMultiplier);
>     }
> 
> #if ENABLE(MEDIA_SESSION)
>diff --git a/Source/WebCore/html/HTMLMediaElement.h b/Source/WebCore/html/HTMLMediaElement.h
>index ba9f59a77c2..5d09e6f94ff 100644
>--- a/Source/WebCore/html/HTMLMediaElement.h
>+++ b/Source/WebCore/html/HTMLMediaElement.h
>@@ -966,6 +966,7 @@ private:
>     SeekType m_pendingSeekType { NoSeek };
> 
>     double m_volume { 1 };
>+    double m_referenceVolume { 1 };
>     bool m_volumeInitialized { false };
>     MediaTime m_lastSeekTime;
>

Actions: View | Formatted Diff | Diff

Attachments on bug 185370: 339705 | 339715 | 339945