Title: [280732] trunk
- Revision
- 280732
- Author
- you...@apple.com
- Date
- 2021-08-06 12:06:15 -0700 (Fri, 06 Aug 2021)
Log Message
[GPUP] Test WebKit2.CrashGPUProcessAfterApplyingConstraints fails when Media in GPU Process is enabled
https://bugs.webkit.org/show_bug.cgi?id=228759
<rdar://problem/81529641>
Reviewed by Geoffrey Garen.
Source/WebCore:
Revert part of https://trac.webkit.org/changeset/279940/webkit.
* platform/mediastream/RealtimeVideoSource.cpp:
(WebCore::RealtimeVideoSource::sourceSettingsChanged):
Covered by API test.
Tools:
* TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
Reenable test.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (280731 => 280732)
--- trunk/Source/WebCore/ChangeLog 2021-08-06 19:04:17 UTC (rev 280731)
+++ trunk/Source/WebCore/ChangeLog 2021-08-06 19:06:15 UTC (rev 280732)
@@ -1,5 +1,19 @@
2021-08-06 Youenn Fablet <you...@apple.com>
+ [GPUP] Test WebKit2.CrashGPUProcessAfterApplyingConstraints fails when Media in GPU Process is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=228759
+ <rdar://problem/81529641>
+
+ Reviewed by Geoffrey Garen.
+
+ Revert part of https://trac.webkit.org/changeset/279940/webkit.
+
+ * platform/mediastream/RealtimeVideoSource.cpp:
+ (WebCore::RealtimeVideoSource::sourceSettingsChanged):
+ Covered by API test.
+
+2021-08-06 Youenn Fablet <you...@apple.com>
+
WebKit::SampleBufferDisplayLayer needs to handle GPUProcess crash
https://bugs.webkit.org/show_bug.cgi?id=228824
<rdar://problem/81564477>
Modified: trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp (280731 => 280732)
--- trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp 2021-08-06 19:04:17 UTC (rev 280731)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp 2021-08-06 19:06:15 UTC (rev 280732)
@@ -112,7 +112,10 @@
void RealtimeVideoSource::sourceSettingsChanged()
{
auto rotation = m_source->sampleRotation();
- auto size = m_source->size();
+ auto size = this->size();
+ if (size.isEmpty())
+ size = m_source->size();
+
if (rotation == MediaSample::VideoRotation::Left || rotation == MediaSample::VideoRotation::Right)
size = size.transposedSize();
Modified: trunk/Tools/ChangeLog (280731 => 280732)
--- trunk/Tools/ChangeLog 2021-08-06 19:04:17 UTC (rev 280731)
+++ trunk/Tools/ChangeLog 2021-08-06 19:06:15 UTC (rev 280732)
@@ -1,3 +1,14 @@
+2021-08-06 Youenn Fablet <you...@apple.com>
+
+ [GPUP] Test WebKit2.CrashGPUProcessAfterApplyingConstraints fails when Media in GPU Process is enabled
+ https://bugs.webkit.org/show_bug.cgi?id=228759
+ <rdar://problem/81529641>
+
+ Reviewed by Geoffrey Garen.
+
+ * TestWebKitAPI/Tests/WebKit/GetUserMedia.mm:
+ Reenable test.
+
2021-08-06 Aakash Jain <aakash_j...@apple.com>
[ews] Make config.json compact
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm (280731 => 280732)
--- trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm 2021-08-06 19:04:17 UTC (rev 280731)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit/GetUserMedia.mm 2021-08-06 19:06:15 UTC (rev 280732)
@@ -648,7 +648,7 @@
EXPECT_EQ(webViewPID, [webView _webProcessIdentifier]);
}
-TEST(WebKit2, DISABLED_CrashGPUProcessAfterApplyingConstraints)
+TEST(WebKit2, CrashGPUProcessAfterApplyingConstraints)
{
auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
auto preferences = [configuration preferences];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
