Title: [188048] trunk/Source/WebKit2
Revision
188048
Author
mra...@apple.com
Date
2015-08-06 11:21:20 -0700 (Thu, 06 Aug 2015)

Log 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:

Modified Paths

Diff

Modified: trunk/Source/WebKit2/ChangeLog (188047 => 188048)


--- trunk/Source/WebKit2/ChangeLog	2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/ChangeLog	2015-08-06 18:21:20 UTC (rev 188048)
@@ -1,3 +1,24 @@
+2015-08-06  Matt Rajca  <mra...@apple.com>
+
+        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:
+
 2015-08-06  Csaba Osztrogonác  <o...@webkit.org>
 
         [EFL] Bump EFL version to 1.15.0

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.cpp (188047 => 188048)


--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.cpp	2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.cpp	2015-08-06 18:21:20 UTC (rev 188048)
@@ -40,13 +40,12 @@
 #endif
 }
 
-void WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused(WKMediaSessionFocusManagerRef manager, void* context, WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback callback)
+bool WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying(WKMediaSessionFocusManagerRef manager)
 {
 #if ENABLE(MEDIA_SESSION)
-    toImpl(manager)->isFocusedContentMediaElementPaused(toGenericCallbackFunction<bool, bool>(context, callback));
+    return toImpl(manager)->isFocusedContentMediaElementPlaying();
 #else
     UNUSED_PARAM(manager);
-    UNUSED_PARAM(context);
-    UNUSED_PARAM(callback);
+    return false;
 #endif
 }

Modified: trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h (188047 => 188048)


--- trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h	2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKMediaSessionFocusManager.h	2015-08-06 18:21:20 UTC (rev 188048)
@@ -38,8 +38,7 @@
 
 WK_EXPORT WKTypeID WKMediaSessionFocusManagerGetTypeID();
 
-typedef void (*WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback)(bool, WKErrorRef, void*);
-WK_EXPORT void WKMediaSessionFocusManagerIsFocusedContentMediaElementPaused(WKMediaSessionFocusManagerRef manager, void* context, WKMediaSessionFocusManagerIsFocusedContentMediaElementPausedCallback callback);
+WK_EXPORT bool WKMediaSessionFocusManagerIsFocusedContentMediaElementPlaying(WKMediaSessionFocusManagerRef manager);
 
 #ifdef __cplusplus
 }

Modified: trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp (188047 => 188048)


--- trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp	2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.cpp	2015-08-06 18:21:20 UTC (rev 188048)
@@ -57,12 +57,12 @@
     API::Object::deref();
 }
 
-void WebMediaSessionFocusManager::isFocusedContentMediaElementPaused(std::function<void(bool, CallbackBase::Error)> callbackFunction)
+bool WebMediaSessionFocusManager::isFocusedContentMediaElementPlaying() const
 {
     if (!m_focusedMediaElement)
-        return;
+        return false;
 
-    callbackFunction(!m_focusedMediaElementIsPlaying, CallbackBase::Error::None);
+    return m_focusedMediaElementIsPlaying;
 }
 
 void WebMediaSessionFocusManager::mediaElementIsPlayingDidChange(WebPageProxy* proxy, uint64_t elementID, bool isPlaying)

Modified: trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h (188047 => 188048)


--- trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h	2015-08-06 18:16:34 UTC (rev 188047)
+++ trunk/Source/WebKit2/UIProcess/WebMediaSessionFocusManager.h	2015-08-06 18:21:20 UTC (rev 188048)
@@ -29,7 +29,6 @@
 #if ENABLE(MEDIA_SESSION)
 
 #include "APIObject.h"
-#include "GenericCallback.h"
 #include "WebContextSupplement.h"
 #include "WebPageProxy.h"
 
@@ -43,7 +42,7 @@
 
     static PassRefPtr<WebMediaSessionFocusManager> create(WebProcessPool*);
 
-    void isFocusedContentMediaElementPaused(std::function<void(bool, CallbackBase::Error)>);
+    bool isFocusedContentMediaElementPlaying() const;
     void mediaElementIsPlayingDidChange(WebPageProxy*, uint64_t, bool);
 
     void setFocusedMediaElement(WebPageProxy&, uint64_t);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to