[webkit-changes] [193764] trunk/Source

Tue, 08 Dec 2015 11:35:19 -0800

Title: [193764] trunk/Source
Revision
193764
Author
eric.carl...@apple.com
Date
2015-12-08 11:35:20 -0800 (Tue, 08 Dec 2015)

Log Message

[MediaStream] Rename UserMediaClient and UserMediaController methods
https://bugs.webkit.org/show_bug.cgi?id=152001

Reviewed by Brady Eidson.

Source/WebCore:

No new tests, no behavior change.

* Modules/mediastream/UserMediaClient.h:
(WebCore::UserMediaClient::~UserMediaClient):
* Modules/mediastream/UserMediaController.h:
(WebCore::UserMediaController::client):
(WebCore::UserMediaController::from):
(WebCore::UserMediaController::requestUserMediaAccess):
(WebCore::UserMediaController::cancelUserMediaAccessRequest):
(WebCore::UserMediaController::requestPermission): Deleted.
(WebCore::UserMediaController::cancelRequest): Deleted.
* Modules/mediastream/UserMediaRequest.cpp:
(WebCore::UserMediaRequest::constraintsValidated):
(WebCore::UserMediaRequest::contextDestroyed):
* platform/mock/UserMediaClientMock.h:

Source/WebKit/mac:

* WebCoreSupport/WebUserMediaClient.h:
* WebCoreSupport/WebUserMediaClient.mm:
(WebUserMediaClient::pageDestroyed):
(WebUserMediaClient::requestUserMediaAccess):
(WebUserMediaClient::cancelUserMediaAccessRequest):
(-[WebUserMediaPolicyListener initWithUserMediaRequest:]):
(-[WebUserMediaPolicyListener cancelUserMediaAccessRequest]):
(WebUserMediaClient::requestPermission): Deleted.
(WebUserMediaClient::cancelRequest): Deleted.
(-[WebUserMediaPolicyListener cancelRequest]): Deleted.

Source/WebKit2:

* WebProcess/WebCoreSupport/WebUserMediaClient.cpp:
(WebKit::WebUserMediaClient::pageDestroyed):
(WebKit::WebUserMediaClient::requestUserMediaAccess):
(WebKit::WebUserMediaClient::cancelUserMediaAccessRequest):
(WebKit::WebUserMediaClient::requestPermission): Deleted.
(WebKit::WebUserMediaClient::cancelRequest): Deleted.
* WebProcess/WebCoreSupport/WebUserMediaClient.h:

Modified Paths

Diff

Modified: trunk/Source/WebCore/ChangeLog (193763 => 193764)


--- trunk/Source/WebCore/ChangeLog	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebCore/ChangeLog	2015-12-08 19:35:20 UTC (rev 193764)
@@ -1,3 +1,26 @@
+2015-12-08  Eric Carlson  <eric.carl...@apple.com>
+
+        [MediaStream] Rename UserMediaClient and UserMediaController methods
+        https://bugs.webkit.org/show_bug.cgi?id=152001
+
+        Reviewed by Brady Eidson.
+
+        No new tests, no behavior change.
+
+        * Modules/mediastream/UserMediaClient.h:
+        (WebCore::UserMediaClient::~UserMediaClient):
+        * Modules/mediastream/UserMediaController.h:
+        (WebCore::UserMediaController::client):
+        (WebCore::UserMediaController::from):
+        (WebCore::UserMediaController::requestUserMediaAccess):
+        (WebCore::UserMediaController::cancelUserMediaAccessRequest):
+        (WebCore::UserMediaController::requestPermission): Deleted.
+        (WebCore::UserMediaController::cancelRequest): Deleted.
+        * Modules/mediastream/UserMediaRequest.cpp:
+        (WebCore::UserMediaRequest::constraintsValidated):
+        (WebCore::UserMediaRequest::contextDestroyed):
+        * platform/mock/UserMediaClientMock.h:
+
 2015-12-08  Jer Noble  <jer.no...@apple.com>
 
         [iOS] Do not exit fullscreen mode during auto-PiP.

Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaClient.h (193763 => 193764)


--- trunk/Source/WebCore/Modules/mediastream/UserMediaClient.h	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaClient.h	2015-12-08 19:35:20 UTC (rev 193764)
@@ -44,8 +44,8 @@
 public:
     virtual void pageDestroyed() = 0;
 
-    virtual void requestPermission(Ref<UserMediaRequest>&&) = 0;
-    virtual void cancelRequest(UserMediaRequest&) = 0;
+    virtual void requestUserMediaAccess(Ref<UserMediaRequest>&&) = 0;
+    virtual void cancelUserMediaAccessRequest(UserMediaRequest&) = 0;
 
 protected:
     virtual ~UserMediaClient() { }

Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaController.h (193763 => 193764)


--- trunk/Source/WebCore/Modules/mediastream/UserMediaController.h	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaController.h	2015-12-08 19:35:20 UTC (rev 193764)
@@ -39,9 +39,10 @@
     ~UserMediaController();
 
     UserMediaClient* client() const { return m_client; }
-    void requestPermission(Ref<UserMediaRequest>&&);
-    void cancelRequest(UserMediaRequest&);
 
+    void requestUserMediaAccess(Ref<UserMediaRequest>&&);
+    void cancelUserMediaAccessRequest(UserMediaRequest&);
+
     WEBCORE_EXPORT static const char* supplementName();
     static UserMediaController* from(Page* page) { return static_cast<UserMediaController*>(Supplement<Page>::from(page, supplementName())); }
 
@@ -49,14 +50,14 @@
     UserMediaClient* m_client;
 };
 
-inline void UserMediaController::requestPermission(Ref<UserMediaRequest>&& request)
+inline void UserMediaController::requestUserMediaAccess(Ref<UserMediaRequest>&& request)
 {
-    m_client->requestPermission(WTF::move(request));
+    m_client->requestUserMediaAccess(WTF::move(request));
 }
 
-inline void UserMediaController::cancelRequest(UserMediaRequest& request)
+inline void UserMediaController::cancelUserMediaAccessRequest(UserMediaRequest& request)
 {
-    m_client->cancelRequest(request);
+    m_client->cancelUserMediaAccessRequest(request);
 }
 
 } // namespace WebCore

Modified: trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp (193763 => 193764)


--- trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebCore/Modules/mediastream/UserMediaRequest.cpp	2015-12-08 19:35:20 UTC (rev 193764)
@@ -131,7 +131,7 @@
     callOnMainThread([protectedThis] {
         // 2 - The constraints are valid, ask the user for access to media.
         if (UserMediaController* controller = protectedThis->m_controller)
-            controller->requestPermission(*protectedThis.get());
+            controller->requestUserMediaAccess(*protectedThis.get());
     });
 }
 
@@ -203,7 +203,7 @@
     Ref<UserMediaRequest> protect(*this);
 
     if (m_controller) {
-        m_controller->cancelRequest(*this);
+        m_controller->cancelUserMediaAccessRequest(*this);
         m_controller = nullptr;
     }

Modified: trunk/Source/WebCore/platform/mock/UserMediaClientMock.h (193763 => 193764)


--- trunk/Source/WebCore/platform/mock/UserMediaClientMock.h	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebCore/platform/mock/UserMediaClientMock.h	2015-12-08 19:35:20 UTC (rev 193764)
@@ -70,13 +70,13 @@
         delete this;
     }
 
-    virtual void requestPermission(Ref<UserMediaRequest>&& request) override
+    virtual void requestUserMediaAccess(Ref<UserMediaRequest>&& request) override
     {
         RefPtr<UserMediaClientRequestNotifier> notifier = adoptRef(new UserMediaClientRequestNotifier(WTF::move(request), true));
         m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));
     }
 
-    virtual void cancelRequest(UserMediaRequest& request) override
+    virtual void cancelUserMediaAccessRequest(UserMediaRequest& request) override
     {
         RefPtr<UserMediaClientRequestNotifier> notifier = adoptRef(new UserMediaClientRequestNotifier(request, false));
         m_timerEvents.append(adoptRef(new TimerEvent(this, notifier)));

Modified: trunk/Source/WebKit/mac/ChangeLog (193763 => 193764)


--- trunk/Source/WebKit/mac/ChangeLog	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebKit/mac/ChangeLog	2015-12-08 19:35:20 UTC (rev 193764)
@@ -1,3 +1,21 @@
+2015-12-08  Eric Carlson  <eric.carl...@apple.com>
+
+        [MediaStream] Rename UserMediaClient and UserMediaController methods
+        https://bugs.webkit.org/show_bug.cgi?id=152001
+
+        Reviewed by Brady Eidson.
+
+        * WebCoreSupport/WebUserMediaClient.h:
+        * WebCoreSupport/WebUserMediaClient.mm:
+        (WebUserMediaClient::pageDestroyed):
+        (WebUserMediaClient::requestUserMediaAccess):
+        (WebUserMediaClient::cancelUserMediaAccessRequest):
+        (-[WebUserMediaPolicyListener initWithUserMediaRequest:]):
+        (-[WebUserMediaPolicyListener cancelUserMediaAccessRequest]):
+        (WebUserMediaClient::requestPermission): Deleted.
+        (WebUserMediaClient::cancelRequest): Deleted.
+        (-[WebUserMediaPolicyListener cancelRequest]): Deleted.
+
 2015-12-07  Alex Christensen  <achristen...@webkit.org>
 
         Build fix after r193675.

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.h (193763 => 193764)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.h	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.h	2015-12-08 19:35:20 UTC (rev 193764)
@@ -44,8 +44,8 @@
     ~WebUserMediaClient();
 
     // UserMediaClient
-    virtual void requestPermission(Ref<WebCore::UserMediaRequest>&&) override;
-    virtual void cancelRequest(WebCore::UserMediaRequest&) override;
+    virtual void requestUserMediaAccess(Ref<WebCore::UserMediaRequest>&&) override;
+    virtual void cancelUserMediaAccessRequest(WebCore::UserMediaRequest&) override;
     virtual void pageDestroyed() override;
 
 private:

Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm (193763 => 193764)


--- trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebUserMediaClient.mm	2015-12-08 19:35:20 UTC (rev 193764)
@@ -46,7 +46,7 @@
     RefPtr<UserMediaRequest> _request;
 }
 - (id)initWithUserMediaRequest:(PassRefPtr<UserMediaRequest>)request;
-- (void)cancelRequest;
+- (void)cancelUserMediaAccessRequest;
 - (void)deny;
 @end
 
@@ -81,14 +81,14 @@
 {
     UserMediaRequestsMap& requestsMap = userMediaRequestsMap();
     for (UserMediaRequestsMap::iterator it = requestsMap.begin(); it != requestsMap.end(); ++it) {
-        [it->value cancelRequest];
+        [it->value cancelUserMediaAccessRequest];
         requestsMap.remove(it);
     }
 
     delete this;
 }
 
-void WebUserMediaClient::requestPermission(Ref<UserMediaRequest>&& prpRequest)
+void WebUserMediaClient::requestUserMediaAccess(Ref<UserMediaRequest>&& prpRequest)
 {
     BEGIN_BLOCK_OBJC_EXCEPTIONS;
 
@@ -111,14 +111,14 @@
     END_BLOCK_OBJC_EXCEPTIONS;
 }
 
-void WebUserMediaClient::cancelRequest(UserMediaRequest& request)
+void WebUserMediaClient::cancelUserMediaAccessRequest(UserMediaRequest& request)
 {
     UserMediaRequestsMap& requestsMap = userMediaRequestsMap();
     UserMediaRequestsMap::iterator it = requestsMap.find(&request);
     if (it == requestsMap.end())
         return;
 
-    [it->value cancelRequest];
+    [it->value cancelUserMediaAccessRequest];
     requestsMap.remove(it);
 }
 
@@ -136,7 +136,7 @@
 #endif
 }
 
-- (void)cancelRequest
+- (void)cancelUserMediaAccessRequest
 {
 #if ENABLE(MEDIA_STREAM)
     if (!_request)

Modified: trunk/Source/WebKit2/ChangeLog (193763 => 193764)


--- trunk/Source/WebKit2/ChangeLog	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebKit2/ChangeLog	2015-12-08 19:35:20 UTC (rev 193764)
@@ -1,3 +1,18 @@
+2015-12-08  Eric Carlson  <eric.carl...@apple.com>
+
+        [MediaStream] Rename UserMediaClient and UserMediaController methods
+        https://bugs.webkit.org/show_bug.cgi?id=152001
+
+        Reviewed by Brady Eidson.
+
+        * WebProcess/WebCoreSupport/WebUserMediaClient.cpp:
+        (WebKit::WebUserMediaClient::pageDestroyed):
+        (WebKit::WebUserMediaClient::requestUserMediaAccess):
+        (WebKit::WebUserMediaClient::cancelUserMediaAccessRequest):
+        (WebKit::WebUserMediaClient::requestPermission): Deleted.
+        (WebKit::WebUserMediaClient::cancelRequest): Deleted.
+        * WebProcess/WebCoreSupport/WebUserMediaClient.h:
+
 2015-12-08  Tomas Popela  <tpop...@redhat.com>
 
         [GTK] Remove an unused variable from WebKitWebContext

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.cpp (193763 => 193764)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.cpp	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.cpp	2015-12-08 19:35:20 UTC (rev 193764)
@@ -39,13 +39,13 @@
     delete this;
 }
 
-void WebUserMediaClient::requestPermission(Ref<UserMediaRequest>&& prRequest)
+void WebUserMediaClient::requestUserMediaAccess(Ref<UserMediaRequest>&& prRequest)
 {
     UserMediaRequest& request = prRequest.leakRef();
     m_page.userMediaPermissionRequestManager().startRequest(request);
 }
 
-void WebUserMediaClient::cancelRequest(UserMediaRequest& request)
+void WebUserMediaClient::cancelUserMediaAccessRequest(UserMediaRequest& request)
 {
     m_page.userMediaPermissionRequestManager().cancelRequest(request);
 }

Modified: trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.h (193763 => 193764)


--- trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.h	2015-12-08 19:34:40 UTC (rev 193763)
+++ trunk/Source/WebKit2/WebProcess/WebCoreSupport/WebUserMediaClient.h	2015-12-08 19:35:20 UTC (rev 193764)
@@ -34,8 +34,8 @@
 
 private:
     virtual void pageDestroyed() override;
-    void requestPermission(Ref<WebCore::UserMediaRequest>&&) override;
-    void cancelRequest(WebCore::UserMediaRequest&) override;
+    void requestUserMediaAccess(Ref<WebCore::UserMediaRequest>&&) override;
+    void cancelUserMediaAccessRequest(WebCore::UserMediaRequest&) override;
 
     WebPage& m_page;
 };

_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to