Title: [219588] trunk/Source/WebKit
- Revision
- 219588
- Author
- [email protected]
- Date
- 2017-07-17 16:56:34 -0700 (Mon, 17 Jul 2017)
Log Message
UserMediaPermissionRequestManagerProxy should not use WebCore::Timer
https://bugs.webkit.org/show_bug.cgi?id=174599
<rdar://problem/33362600>
Reviewed by Tim Horton.
UserMediaPermissionRequestManagerProxy should not use WebCore::Timer since it runs in the
UIProcess. Switch to using RunLoop::Timer instead.
* UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
(WebKit::UserMediaPermissionRequestManagerProxy::UserMediaPermissionRequestManagerProxy):
* UIProcess/UserMediaPermissionRequestManagerProxy.h:
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (219587 => 219588)
--- trunk/Source/WebKit/ChangeLog 2017-07-17 23:55:22 UTC (rev 219587)
+++ trunk/Source/WebKit/ChangeLog 2017-07-17 23:56:34 UTC (rev 219588)
@@ -1,5 +1,20 @@
2017-07-17 Chris Dumez <[email protected]>
+ UserMediaPermissionRequestManagerProxy should not use WebCore::Timer
+ https://bugs.webkit.org/show_bug.cgi?id=174599
+ <rdar://problem/33362600>
+
+ Reviewed by Tim Horton.
+
+ UserMediaPermissionRequestManagerProxy should not use WebCore::Timer since it runs in the
+ UIProcess. Switch to using RunLoop::Timer instead.
+
+ * UIProcess/UserMediaPermissionRequestManagerProxy.cpp:
+ (WebKit::UserMediaPermissionRequestManagerProxy::UserMediaPermissionRequestManagerProxy):
+ * UIProcess/UserMediaPermissionRequestManagerProxy.h:
+
+2017-07-17 Chris Dumez <[email protected]>
+
NETWORK_SESSION does not need didReceiveAuthenticationChallenge(uint64_t, uint64_t, const AuthenticationChallenge&)
https://bugs.webkit.org/show_bug.cgi?id=174595
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (219587 => 219588)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2017-07-17 23:55:22 UTC (rev 219587)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp 2017-07-17 23:56:34 UTC (rev 219588)
@@ -42,7 +42,7 @@
UserMediaPermissionRequestManagerProxy::UserMediaPermissionRequestManagerProxy(WebPageProxy& page)
: m_page(page)
- , m_rejectionTimer(*this, &UserMediaPermissionRequestManagerProxy::rejectionTimerFired)
+ , m_rejectionTimer(RunLoop::main(), this, &UserMediaPermissionRequestManagerProxy::rejectionTimerFired)
{
#if ENABLE(MEDIA_STREAM)
UserMediaProcessManager::singleton().addUserMediaPermissionRequestManagerProxy(*this);
Modified: trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h (219587 => 219588)
--- trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h 2017-07-17 23:55:22 UTC (rev 219587)
+++ trunk/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h 2017-07-17 23:56:34 UTC (rev 219588)
@@ -23,8 +23,8 @@
#include "UserMediaPermissionRequestProxy.h"
#include <WebCore/MediaProducer.h>
#include <WebCore/SecurityOrigin.h>
-#include <WebCore/Timer.h>
#include <wtf/HashMap.h>
+#include <wtf/RunLoop.h>
#include <wtf/Seconds.h>
namespace WebCore {
@@ -81,7 +81,7 @@
WebPageProxy& m_page;
- WebCore::Timer m_rejectionTimer;
+ RunLoop::Timer<UserMediaPermissionRequestManagerProxy> m_rejectionTimer;
Vector<uint64_t> m_pendingRejections;
Vector<Ref<UserMediaPermissionRequestProxy>> m_pregrantedRequests;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
