Title: [210707] branches/safari-603-branch/Source/WebKit2
- Revision
- 210707
- Author
- matthew_han...@apple.com
- Date
- 2017-01-12 22:10:23 -0800 (Thu, 12 Jan 2017)
Log Message
Merge r210619. rdar://problem/27745004
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebKit2/ChangeLog (210706 => 210707)
--- branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 06:10:21 UTC (rev 210706)
+++ branches/safari-603-branch/Source/WebKit2/ChangeLog 2017-01-13 06:10:23 UTC (rev 210707)
@@ -1,5 +1,21 @@
2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+ Merge r210619. rdar://problem/27745004
+
+ 2017-01-11 Brent Fulgham <bfulg...@apple.com>
+
+ [WK2][Cocoa] Avoid null dereference in FullScreen code.
+ https://bugs.webkit.org/show_bug.cgi?id=166957
+ <rdar://problem/27745004>
+
+ Reviewed by Eric Carlson.
+
+ * WebProcess/cocoa/WebVideoFullscreenManager.mm:
+ (WebKit::WebVideoFullscreenManager::didSetupFullscreen): Use protected reference to 'this', and check for valid
+ page before attempting to use it.
+
+2017-01-12 Matthew Hanson <matthew_han...@apple.com>
+
Merge r210596. rdar://problem/29757269
2017-01-11 Anders Carlsson <ander...@apple.com>
Modified: branches/safari-603-branch/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm (210706 => 210707)
--- branches/safari-603-branch/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm 2017-01-13 06:10:21 UTC (rev 210706)
+++ branches/safari-603-branch/Source/WebKit2/WebProcess/cocoa/WebVideoFullscreenManager.mm 2017-01-13 06:10:23 UTC (rev 210707)
@@ -1,5 +1,5 @@
/*
- * Copyright (C) 2014 Apple Inc. All rights reserved.
+ * Copyright (C) 2014-2017 Apple Inc. All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
@@ -329,7 +329,10 @@
model->setVideoFullscreenLayer(videoLayer, [strongThis, this, contextId] {
dispatch_async(dispatch_get_main_queue(), [strongThis, this, contextId] {
- m_page->send(Messages::WebVideoFullscreenManagerProxy::EnterFullscreen(contextId), m_page->pageID());
+ if (!strongThis->m_page)
+ return;
+
+ m_page->send(Messages::WebVideoFullscreenManagerProxy::EnterFullscreen(contextId), strongThis->m_page->pageID());
});
});
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
