Title: [219770] branches/safari-604-branch/Source/WebKit

Diff

Modified: branches/safari-604-branch/Source/WebKit/ChangeLog (219769 => 219770)


--- branches/safari-604-branch/Source/WebKit/ChangeLog	2017-07-23 06:50:41 UTC (rev 219769)
+++ branches/safari-604-branch/Source/WebKit/ChangeLog	2017-07-23 06:50:45 UTC (rev 219770)
@@ -1,5 +1,24 @@
 2017-07-22  Jason Marcell  <[email protected]>
 
+        Cherry-pick r219588. rdar://problem/33464447
+
+    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-22  Jason Marcell  <[email protected]>
+
         Cherry-pick r219585. rdar://problem/33465177
 
     2017-07-17  Wenson Hsieh  <[email protected]>

Modified: branches/safari-604-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp (219769 => 219770)


--- branches/safari-604-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp	2017-07-23 06:50:41 UTC (rev 219769)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.cpp	2017-07-23 06:50:45 UTC (rev 219770)
@@ -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: branches/safari-604-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h (219769 => 219770)


--- branches/safari-604-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h	2017-07-23 06:50:41 UTC (rev 219769)
+++ branches/safari-604-branch/Source/WebKit/UIProcess/UserMediaPermissionRequestManagerProxy.h	2017-07-23 06:50:45 UTC (rev 219770)
@@ -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

Reply via email to