Title: [191504] trunk/Source/WebKit2
- Revision
- 191504
- Author
- [email protected]
- Date
- 2015-10-23 12:01:34 -0700 (Fri, 23 Oct 2015)
Log Message
[MediaStream] Fix UserMediaPermissionRequestProxy::invalidate
https://bugs.webkit.org/show_bug.cgi?id=150503
<rdar://problem/23235386>
Reviewed by Dean Jackson.
* UIProcess/UserMediaPermissionRequestProxy.cpp:
(WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy): m_manager is a pointer.
(WebKit::UserMediaPermissionRequestProxy::allow): Return early if m_manager is null, clear it after
calling the manager.
(WebKit::UserMediaPermissionRequestProxy::deny): Ditto.
(WebKit::UserMediaPermissionRequestProxy::invalidate): Clear m_manager.
* UIProcess/UserMediaPermissionRequestProxy.h: Change m_manager from a reference to a
pointer so it can be cleared.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191503 => 191504)
--- trunk/Source/WebKit2/ChangeLog 2015-10-23 18:41:17 UTC (rev 191503)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-23 19:01:34 UTC (rev 191504)
@@ -1,3 +1,20 @@
+2015-10-23 Eric Carlson <[email protected]>
+
+ [MediaStream] Fix UserMediaPermissionRequestProxy::invalidate
+ https://bugs.webkit.org/show_bug.cgi?id=150503
+ <rdar://problem/23235386>
+
+ Reviewed by Dean Jackson.
+
+ * UIProcess/UserMediaPermissionRequestProxy.cpp:
+ (WebKit::UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy): m_manager is a pointer.
+ (WebKit::UserMediaPermissionRequestProxy::allow): Return early if m_manager is null, clear it after
+ calling the manager.
+ (WebKit::UserMediaPermissionRequestProxy::deny): Ditto.
+ (WebKit::UserMediaPermissionRequestProxy::invalidate): Clear m_manager.
+ * UIProcess/UserMediaPermissionRequestProxy.h: Change m_manager from a reference to a
+ pointer so it can be cleared.
+
2015-10-23 Claudio Saavedra <[email protected]>
[GTK] Minor web editor fixes
Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp (191503 => 191504)
--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2015-10-23 18:41:17 UTC (rev 191503)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.cpp 2015-10-23 19:01:34 UTC (rev 191504)
@@ -27,7 +27,7 @@
namespace WebKit {
UserMediaPermissionRequestProxy::UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy& manager, uint64_t userMediaID, const Vector<String>& audioDeviceUIDs, const Vector<String>& videoDeviceUIDs)
- : m_manager(manager)
+ : m_manager(&manager)
, m_userMediaID(userMediaID)
, m_videoDeviceUIDs(videoDeviceUIDs)
, m_audioDeviceUIDs(audioDeviceUIDs)
@@ -36,17 +36,27 @@
void UserMediaPermissionRequestProxy::allow(const String& audioDeviceUID, const String& videoDeviceUID)
{
- m_manager.didReceiveUserMediaPermissionDecision(m_userMediaID, true, audioDeviceUID, videoDeviceUID);
+ ASSERT(m_manager);
+ if (!m_manager)
+ return;
+
+ m_manager->didReceiveUserMediaPermissionDecision(m_userMediaID, true, audioDeviceUID, videoDeviceUID);
+ m_manager = nullptr;
}
void UserMediaPermissionRequestProxy::deny()
{
- m_manager.didReceiveUserMediaPermissionDecision(m_userMediaID, false, emptyString(), emptyString());
+ ASSERT(m_manager);
+ if (!m_manager)
+ return;
+
+ m_manager->didReceiveUserMediaPermissionDecision(m_userMediaID, false, emptyString(), emptyString());
+ m_manager = nullptr;
}
void UserMediaPermissionRequestProxy::invalidate()
{
- m_manager.invalidateRequests();
+ m_manager = nullptr;
}
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h (191503 => 191504)
--- trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2015-10-23 18:41:17 UTC (rev 191503)
+++ trunk/Source/WebKit2/UIProcess/UserMediaPermissionRequestProxy.h 2015-10-23 19:01:34 UTC (rev 191504)
@@ -53,7 +53,7 @@
private:
UserMediaPermissionRequestProxy(UserMediaPermissionRequestManagerProxy&, uint64_t userMediaID, const Vector<String>& videoDeviceUIDs, const Vector<String>& audioDeviceUIDs);
- UserMediaPermissionRequestManagerProxy& m_manager;
+ UserMediaPermissionRequestManagerProxy* m_manager;
uint64_t m_userMediaID;
Vector<String> m_videoDeviceUIDs;
Vector<String> m_audioDeviceUIDs;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes