Title: [259041] trunk/Source/WebKit
- Revision
- 259041
- Author
- ddkil...@apple.com
- Date
- 2020-03-26 03:39:08 -0700 (Thu, 26 Mar 2020)
Log Message
VideoFullscreenManagerProxy::setupFullscreenWithID should message check videoLayerID
<https://webkit.org/b/209578>
<rdar://problem/60703503>
Reviewed by Eric Carlson.
* UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
(MESSAGE_CHECK): Define (and undef) new macro for assertions.
(WebKit::VideoFullscreenManagerProxy::setupFullscreenWithID):
Change ASSERT() to MESSAGE_CHECK().
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (259040 => 259041)
--- trunk/Source/WebKit/ChangeLog 2020-03-26 10:10:59 UTC (rev 259040)
+++ trunk/Source/WebKit/ChangeLog 2020-03-26 10:39:08 UTC (rev 259041)
@@ -1,3 +1,16 @@
+2020-03-26 David Kilzer <ddkil...@apple.com>
+
+ VideoFullscreenManagerProxy::setupFullscreenWithID should message check videoLayerID
+ <https://webkit.org/b/209578>
+ <rdar://problem/60703503>
+
+ Reviewed by Eric Carlson.
+
+ * UIProcess/Cocoa/VideoFullscreenManagerProxy.mm:
+ (MESSAGE_CHECK): Define (and undef) new macro for assertions.
+ (WebKit::VideoFullscreenManagerProxy::setupFullscreenWithID):
+ Change ASSERT() to MESSAGE_CHECK().
+
2020-03-26 Michael Catanzaro <mcatanz...@gnome.org>
Syscall param sendmsg(msg.msg_iov[0]) points to uninitialised byte(s) in IPC::Connection::sendOutgoingMessage
Modified: trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (259040 => 259041)
--- trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2020-03-26 10:10:59 UTC (rev 259040)
+++ trunk/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2020-03-26 10:39:08 UTC (rev 259041)
@@ -121,6 +121,7 @@
#endif
+#define MESSAGE_CHECK(assertion) MESSAGE_CHECK_BASE(assertion, m_page->process().connection())
#define MESSAGE_CHECK_CONTEXTID(identifier) MESSAGE_CHECK_BASE(m_contextMap.isValidKey(identifier), m_page->process().connection())
namespace WebKit {
@@ -491,9 +492,8 @@
void VideoFullscreenManagerProxy::setupFullscreenWithID(uint64_t contextId, uint32_t videoLayerID, const WebCore::IntRect& initialRect, float hostingDeviceScaleFactor, HTMLMediaElementEnums::VideoFullscreenMode videoFullscreenMode, bool allowsPictureInPicture, bool standby)
{
MESSAGE_CHECK_CONTEXTID(contextId);
+ MESSAGE_CHECK(videoLayerID);
- ASSERT(videoLayerID);
-
auto& [model, interface] = ensureModelAndInterface(contextId);
addClientForContext(contextId);
@@ -729,5 +729,6 @@
} // namespace WebKit
#undef MESSAGE_CHECK_CONTEXTID
+#undef MESSAGE_CHECK
#endif // PLATFORM(IOS_FAMILY) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
