Changeset 240434 in webkit


Ignore:
Timestamp:
Jan 24, 2019 7:31:02 AM (5 years ago)
Author:
eric.carlson@apple.com
Message:

[iOS] Enable media element volume on iPad
https://bugs.webkit.org/show_bug.cgi?id=193745
<rdar://problem/47452297>

Reviewed by Jer Noble.

  • html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::setVolume):
(WebCore::HTMLMediaElement::mediaPlayerVolumeChanged):
(WebCore::HTMLMediaElement::updateVolume):

  • platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:

(WebCore::MediaPlayerPrivateAVFoundationObjC::setVolume):

Location:
trunk/Source/WebCore
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/WebCore/ChangeLog

    r240428 r240434  
     12019-01-24  Eric Carlson  <eric.carlson@apple.com>
     2
     3        [iOS] Enable media element volume on iPad
     4        https://bugs.webkit.org/show_bug.cgi?id=193745
     5        <rdar://problem/47452297>
     6
     7        Reviewed by Jer Noble.
     8
     9        * html/HTMLMediaElement.cpp:
     10        (WebCore::HTMLMediaElement::setVolume):
     11        (WebCore::HTMLMediaElement::mediaPlayerVolumeChanged):
     12        (WebCore::HTMLMediaElement::updateVolume):
     13
     14        * platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm:
     15        (WebCore::MediaPlayerPrivateAVFoundationObjC::setVolume):
     16
    1172019-01-24  Carlos Garcia Campos  <cgarcia@igalia.com>
    218
  • trunk/Source/WebCore/html/HTMLMediaElement.cpp

    r240237 r240434  
    37133713        return Exception { IndexSizeError };
    37143714
    3715 #if !PLATFORM(IOS_FAMILY)
     3715#if PLATFORM(IOS_FAMILY)
     3716    if (!processingUserGestureForMedia())
     3717        return { };
     3718#endif
     3719
    37163720    if (m_volume == volume)
    37173721        return { };
     
    37293733        setAutoplayEventPlaybackState(AutoplayEventPlaybackState::PreventedAutoplay);
    37303734    }
    3731 #endif
     3735
    37323736    return { };
    37333737}
     
    49204924    beginProcessingMediaPlayerCallback();
    49214925    if (m_player) {
    4922         double vol = m_player->volume();
    4923         if (vol != m_volume) {
    4924             m_volume = vol;
     4926        double volume = m_player->volume();
     4927        if (volume != m_volume) {
     4928            m_volume = volume;
    49254929            updateVolume();
    49264930            scheduleEvent(eventNames().volumechangeEvent);
     
    53355339    if (!m_player)
    53365340        return;
    5337 #if PLATFORM(IOS_FAMILY)
    5338     // Only the user can change audio volume so update the cached volume and post the changed event.
    5339     float volume = m_player->volume();
    5340     if (m_volume != volume) {
    5341         m_volume = volume;
    5342         scheduleEvent(eventNames().volumechangeEvent);
    5343     }
    5344 #else
     5341
    53455342    // Avoid recursion when the player reports volume changes.
    53465343    if (!processingMediaPlayerCallback()) {
     
    53715368    if (hasMediaControls())
    53725369        mediaControls()->changedVolume();
    5373 #endif
    53745370}
    53755371
  • trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateAVFoundationObjC.mm

    r240168 r240434  
    306306
    307307#if HAVE(CELESTIAL)
    308 
    309308SOFT_LINK_PRIVATE_FRAMEWORK(Celestial)
    310309SOFT_LINK_CONSTANT(Celestial, AVController_RouteDescriptionKey_RouteCurrentlyPicked, NSString *)
     
    314313#define AVController_RouteDescriptionKey_RouteName getAVController_RouteDescriptionKey_RouteName()
    315314#define AVController_RouteDescriptionKey_AVAudioRouteName getAVController_RouteDescriptionKey_AVAudioRouteName()
    316 
    317315#endif // HAVE(CELESTIAL)
    318316
     
    13831381{
    13841382#if PLATFORM(IOS_FAMILY)
    1385     UNUSED_PARAM(volume);
    1386     return;
    1387 #else
     1383    if ([[PAL::getUIDeviceClass() currentDevice] userInterfaceIdiom] != UIUserInterfaceIdiomPad)
     1384        return;
     1385#endif
     1386
    13881387    if (!m_avPlayer)
    13891388        return;
    13901389
    13911390    [m_avPlayer.get() setVolume:volume];
    1392 #endif
    13931391}
    13941392
Note: See TracChangeset for help on using the changeset viewer.