Title: [259302] trunk
- Revision
- 259302
- Author
- jer.no...@apple.com
- Date
- 2020-03-31 12:19:43 -0700 (Tue, 31 Mar 2020)
Log Message
REGRESSION: [ Mac wk2 Release ] Flaky crash in WebCore::MediaPlayer::createVideoFullscreenLayer
https://bugs.webkit.org/show_bug.cgi?id=209668
<rdar://problem/60976297>
Reviewed by Darin Adler.
Source/WebCore:
Null check m_player and m_videoElement before calling createVideoFullscreenLayer().
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::createVideoFullscreenLayer):
* platform/cocoa/VideoFullscreenModelVideoElement.mm:
(WebCore::VideoFullscreenModelVideoElement::createVideoFullscreenLayer):
LayoutTests:
* platform/mac-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (259301 => 259302)
--- trunk/LayoutTests/ChangeLog 2020-03-31 18:22:44 UTC (rev 259301)
+++ trunk/LayoutTests/ChangeLog 2020-03-31 19:19:43 UTC (rev 259302)
@@ -1,3 +1,13 @@
+2020-03-31 Jer Noble <jer.no...@apple.com>
+
+ REGRESSION: [ Mac wk2 Release ] Flaky crash in WebCore::MediaPlayer::createVideoFullscreenLayer
+ https://bugs.webkit.org/show_bug.cgi?id=209668
+ <rdar://problem/60976297>
+
+ Reviewed by Darin Adler.
+
+ * platform/mac-wk2/TestExpectations:
+
2020-03-31 Jason Lawrence <lawrenc...@apple.com>
[ Mac Debug ] ASSERTION FAILED: m_videoFullscreenMode on media/media-fullscreen-return-to-inline.html
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (259301 => 259302)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-03-31 18:22:44 UTC (rev 259301)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2020-03-31 19:19:43 UTC (rev 259302)
@@ -760,7 +760,7 @@
webkit.org/b/182176 imported/w3c/web-platform-tests/service-workers/service-worker/appcache-ordering-main.https.html [ Skip ]
-webkit.org/b/183869 media/modern-media-controls/seek-backward-support/seek-backward-support.html [ Pass Failure Crash ]
+webkit.org/b/183869 media/modern-media-controls/seek-backward-support/seek-backward-support.html [ Pass Failure ]
webkit.org/b/184245 http/tests/workers/service/service-worker-cache-api.https.html [ Pass Failure ]
@@ -1039,6 +1039,4 @@
webkit.org/b/209672 http/wpt/service-workers/service-worker-spinning-fetch.https.html [ Pass Failure Crash ]
-webkit.org/b/209688 media/modern-media-controls/scrubber-support/scrubber-support-click.html [ Pass Crash ]
-
webkit.org/b/209769 [ Catalina ] tiled-drawing/scrolling/frames/frameset-nested-frame-scrollability.html [ Pass Failure ]
\ No newline at end of file
Modified: trunk/Source/WebCore/ChangeLog (259301 => 259302)
--- trunk/Source/WebCore/ChangeLog 2020-03-31 18:22:44 UTC (rev 259301)
+++ trunk/Source/WebCore/ChangeLog 2020-03-31 19:19:43 UTC (rev 259302)
@@ -1,3 +1,18 @@
+2020-03-31 Jer Noble <jer.no...@apple.com>
+
+ REGRESSION: [ Mac wk2 Release ] Flaky crash in WebCore::MediaPlayer::createVideoFullscreenLayer
+ https://bugs.webkit.org/show_bug.cgi?id=209668
+ <rdar://problem/60976297>
+
+ Reviewed by Darin Adler.
+
+ Null check m_player and m_videoElement before calling createVideoFullscreenLayer().
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::createVideoFullscreenLayer):
+ * platform/cocoa/VideoFullscreenModelVideoElement.mm:
+ (WebCore::VideoFullscreenModelVideoElement::createVideoFullscreenLayer):
+
2020-03-31 Chris Dumez <cdu...@apple.com>
ASSERTION FAILED: m_wrapper on imported/w3c/web-platform-tests/html/semantics/embedded-content/media-elements/ready-states/autoplay.html
Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (259301 => 259302)
--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2020-03-31 18:22:44 UTC (rev 259301)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2020-03-31 19:19:43 UTC (rev 259302)
@@ -6248,7 +6248,9 @@
RetainPtr<PlatformLayer> HTMLMediaElement::createVideoFullscreenLayer()
{
- return m_player->createVideoFullscreenLayer();
+ if (m_player)
+ return m_player->createVideoFullscreenLayer();
+ return nullptr;
}
void HTMLMediaElement::setVideoFullscreenLayer(PlatformLayer* platformLayer, WTF::Function<void()>&& completionHandler)
Modified: trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm (259301 => 259302)
--- trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm 2020-03-31 18:22:44 UTC (rev 259301)
+++ trunk/Source/WebCore/platform/cocoa/VideoFullscreenModelVideoElement.mm 2020-03-31 19:19:43 UTC (rev 259302)
@@ -112,7 +112,9 @@
RetainPtr<PlatformLayer> VideoFullscreenModelVideoElement::createVideoFullscreenLayer()
{
- return m_videoElement->createVideoFullscreenLayer();
+ if (m_videoElement)
+ return m_videoElement->createVideoFullscreenLayer();
+ return nullptr;
}
void VideoFullscreenModelVideoElement::setVideoFullscreenLayer(PlatformLayer* videoLayer, WTF::Function<void()>&& completionHandler)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
