Title: [234387] branches/safari-606-branch/Source/WebKit
- Revision
- 234387
- Author
- [email protected]
- Date
- 2018-07-30 15:01:32 -0700 (Mon, 30 Jul 2018)
Log Message
Revert r234081. rdar://problem/42490080
Modified Paths
Diff
Modified: branches/safari-606-branch/Source/WebKit/ChangeLog (234386 => 234387)
--- branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-30 22:01:30 UTC (rev 234386)
+++ branches/safari-606-branch/Source/WebKit/ChangeLog 2018-07-30 22:01:32 UTC (rev 234387)
@@ -1,5 +1,9 @@
2018-07-30 Babak Shafiei <[email protected]>
+ Revert r234081. rdar://problem/42490080
+
+2018-07-30 Babak Shafiei <[email protected]>
+
Cherry-pick r234369. rdar://problem/42736179
Potential null dereference under WebPage::applicationDidBecomeActive()
Modified: branches/safari-606-branch/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm (234386 => 234387)
--- branches/safari-606-branch/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2018-07-30 22:01:30 UTC (rev 234386)
+++ branches/safari-606-branch/Source/WebKit/UIProcess/Cocoa/VideoFullscreenManagerProxy.mm 2018-07-30 22:01:32 UTC (rev 234387)
@@ -449,7 +449,6 @@
clientCount--;
if (clientCount <= 0) {
- ensureInterface(contextId).setVideoFullscreenModel(nullptr);
m_playbackSessionManagerProxy->removeClientForContext(contextId);
m_clientCounts.remove(contextId);
m_contextMap.remove(contextId);
@@ -647,6 +646,7 @@
m_page->send(Messages::VideoFullscreenManager::DidCleanupFullscreen(contextId), m_page->pageID());
interface->setMode(HTMLMediaElementEnums::VideoFullscreenModeNone);
+ interface->setVideoFullscreenModel(nullptr);
removeClientForContext(contextId);
}
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
