Title: [265505] branches/safari-610.1.25.10-branch/Source/WebCore
- Revision
- 265505
- Author
- repst...@apple.com
- Date
- 2020-08-11 10:30:53 -0700 (Tue, 11 Aug 2020)
Log Message
Cherry-pick r265357. rdar://problem/66801720
Web process crashes at WebCore::FullscreenManager::didExitFullscreen
https://bugs.webkit.org/show_bug.cgi?id=215243
Reviewed by Eric Carlson.
No new tests, no functional change.
* dom/FullscreenManager.cpp:
(WebCore::FullscreenManager::didExitFullscreen):
m_fullscreenElement might be nullptr when fullscreenOrPendingElement() is not nullptr.
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265357 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.25.10-branch/Source/WebCore/ChangeLog (265504 => 265505)
--- branches/safari-610.1.25.10-branch/Source/WebCore/ChangeLog 2020-08-11 17:30:51 UTC (rev 265504)
+++ branches/safari-610.1.25.10-branch/Source/WebCore/ChangeLog 2020-08-11 17:30:53 UTC (rev 265505)
@@ -1,3 +1,34 @@
+2020-08-11 Russell Epstein <repst...@apple.com>
+
+ Cherry-pick r265357. rdar://problem/66801720
+
+ Web process crashes at WebCore::FullscreenManager::didExitFullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=215243
+
+ Reviewed by Eric Carlson.
+
+ No new tests, no functional change.
+
+ * dom/FullscreenManager.cpp:
+ (WebCore::FullscreenManager::didExitFullscreen):
+ m_fullscreenElement might be nullptr when fullscreenOrPendingElement() is not nullptr.
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265357 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-08-06 Peng Liu <peng.l...@apple.com>
+
+ Web process crashes at WebCore::FullscreenManager::didExitFullscreen
+ https://bugs.webkit.org/show_bug.cgi?id=215243
+
+ Reviewed by Eric Carlson.
+
+ No new tests, no functional change.
+
+ * dom/FullscreenManager.cpp:
+ (WebCore::FullscreenManager::didExitFullscreen):
+ m_fullscreenElement might be nullptr when fullscreenOrPendingElement() is not nullptr.
+
2020-08-10 Alan Coon <alanc...@apple.com>
Cherry-pick r265282. rdar://problem/66643985
Modified: branches/safari-610.1.25.10-branch/Source/WebCore/dom/FullscreenManager.cpp (265504 => 265505)
--- branches/safari-610.1.25.10-branch/Source/WebCore/dom/FullscreenManager.cpp 2020-08-11 17:30:51 UTC (rev 265504)
+++ branches/safari-610.1.25.10-branch/Source/WebCore/dom/FullscreenManager.cpp 2020-08-11 17:30:53 UTC (rev 265505)
@@ -421,8 +421,10 @@
if (!hasLivingRenderTree() || backForwardCacheState() != Document::NotInBackForwardCache)
return;
fullscreenElement->setContainsFullScreenElementOnAncestorsCrossingFrameBoundaries(false);
- m_fullscreenElement->didStopBeingFullscreenElement();
+ if (m_fullscreenElement)
+ m_fullscreenElement->didStopBeingFullscreenElement();
+
m_areKeysEnabledInFullscreen = false;
unwrapFullscreenRenderer(m_fullscreenRenderer.get(), m_fullscreenElement.get());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
