Changeset 188048 in webkit


Ignore:
Timestamp:
Aug 6, 2015 11:21:20 AM (9 years ago)
Author:
mrajca@apple.com
Message:

Media Session: rename isFocusedContentMediaElementPaused and get rid of callback
​https://bugs.webkit.org/show_bug.cgi?id=147726

Reviewed by Simon Fraser.

  • isFocusedContentMediaElementPaused should be renamed to isFocusedContentMediaElementPlaying to match recent refactoring work.
  • isFocusedContentMediaElementPlaying itself does not need a callback anymore because the value can be returned directly.
  • UIProcess/API/C/WKMediaSessionFocusManager.cpp:

(WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying): Removed callback and renamed from...
(WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused): Deleted.

  • UIProcess/API/C/WKMediaSessionFocusManager.h:
  • UIProcess/WebMediaSessionFocusManager.cpp:

(WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPlaying): Removed callback and renamed from...
(WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPaused): Deleted.

  • UIProcess/WebMediaSessionFocusManager.h:
Location:
trunk/Source/WebKit2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/WebKit2/ChangeLog

    r188038 r188048  
     12015-08-06  Matt Rajca  <mrajca@apple.com>
     2
     3        Media Session: rename isFocusedContentMediaElementPaused and get rid of callback
     4        https://bugs.webkit.org/show_bug.cgi?id=147726
     5
     6        Reviewed by Simon Fraser.
     7
     8        - isFocusedContentMediaElementPaused should be renamed to isFocusedContentMediaElementPlaying to match recent
     9          refactoring work.
     10        - isFocusedContentMediaElementPlaying itself does not need a callback anymore because the value can be returned
     11          directly.
     12
     13        * UIProcess/API/C/WKMediaSessionFocusManager.cpp:
     14        (WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying): Removed callback and renamed from...
     15        (WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused): Deleted.
     16        * UIProcess/API/C/WKMediaSessionFocusManager.h:
     17        * UIProcess/WebMediaSessionFocusManager.cpp:
     18        (WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPlaying): Removed callback and renamed from...
     19        (WebKit::WebMediaSessionFocusManager::isFocusedContentMediaElementPaused): Deleted.
     20        * UIProcess/WebMediaSessionFocusManager.h:
     21
    1222015-08-06  Csaba Osztrogonác  <ossy@webkit.org>
    223

  • trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.cpp

    r187917 r188048  
    4141}
    4242
    43 void WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused(WKMediaSessionFocusManagerRef manager, void* context, WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback callback)
     43bool WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying(WKMediaSessionFocusManagerRef manager)
    4444{
    4545#if ENABLE(MEDIA_SESSION)
    46     toImpl(manager)->isFocusedContentMediaElementPaused(toGenericCallbackFunction<bool, bool>(context, callback));
     46    return toImpl(manager)->isFocusedContentMediaElementPlaying();
    4747#else
    4848    UNUSED_PARAM(manager);
    49     UNUSED_PARAM(context);
    50     UNUSED_PARAM(callback);
     49    return false;
    5150#endif
    5251}

  • trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h

    r187917 r188048  
    3939WK_EXPORT WKTypeID WKMediaSessionFocusManagerGetTypeID();
    4040
    41 typedef void (*WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback)(bool, WKErrorRef, void*);
    42 WK_EXPORT void WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused(WKMediaSessionFocusManagerRef manager, void* context, WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback callback);
     41WK_EXPORT bool WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying(WKMediaSessionFocusManagerRef manager);
    4342
    4443#ifdef __cplusplus

  • trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp

    r188030 r188048  
    5858}
    5959
    60 void WebMediaSessionFocusManager::isFocusedContentMediaElementPaused(std::function<void(bool, CallbackBase::Error)> callbackFunction)
     60bool WebMediaSessionFocusManager::isFocusedContentMediaElementPlaying() const
    6161{
    6262    if (!m_focusedMediaElement)
    63         return;
     63        return false;
    6464
    65     callbackFunction(!m_focusedMediaElementIsPlaying, CallbackBase::Error::None);
     65    return m_focusedMediaElementIsPlaying;
    6666}
    6767

  • trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h

    r188030 r188048  
    3030
    3131#include "APIObject.h"
    32 #include "GenericCallback.h"
    3332#include "WebContextSupplement.h"
    3433#include "WebPageProxy.h"
    … …  
    4443    static PassRefPtr<WebMediaSessionFocusManager> create(WebProcessPool*);
    4544
    46     void isFocusedContentMediaElementPaused(std::function<void(bool, CallbackBase::Error)>);
     45    bool isFocusedContentMediaElementPlaying() const;
    4746    void mediaElementIsPlayingDidChange(WebPageProxy*, uint64_t, bool);
    4847
Note: See TracChangeset for help on using the changeset viewer.