Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix timeout of HEIC test #8527

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions LayoutTests/platform/mac-wk2/TestExpectations
Original file line number Diff line number Diff line change
Expand Up @@ -1765,7 +1765,10 @@ webkit.org/b/248734 media/video-inaccurate-duration-ended.html [ Crash ]
[ Monterey+ ] fast/borders/border-painting-correctness-dotted.html [ ImageOnlyFailure ]
[ BigSur+ ] fast/canvas/webgl/lose-context-on-timeout.html [ Timeout ]
[ BigSur+ x86_64 ] css3/blending/background-blend-mode-body-image.html [ ImageOnlyFailure ]
[ BigSur+ ] fast/images/animated-heics-verify.html [ Timeout Crash ]
[ BigSur Monterey ] fast/images/animated-heics-draw.html [ Skip ]
[ Ventura+ ] fast/images/animated-heics-draw.html [ Pass Timeout ]
[ BigSur Monterey ] fast/images/animated-heics-verify.html [ Skip ]
[ Ventura+ ] fast/images/animated-heics-verify.html [ Pass Failure ]
[ Ventura+ ] model-element/model-element-ready.html [ Pass Failure ]
[ Monterey+ ] model-element/model-element-graphics-layers-opacity.html [ Failure ]
[ Ventura+ ] http/tests/resourceLoadStatistics/website-data-removal-for-site-without-user-interaction.html [ Failure ]
Expand Down Expand Up @@ -1806,8 +1809,6 @@ webkit.org/b/248734 media/video-inaccurate-duration-ended.html [ Crash ]
[ Monterey+ Debug x86_64 ] storage/indexeddb/request-with-null-open-db-request.html [ Pass Crash ]
[ BigSur+ ] imported/w3c/web-platform-tests/service-workers/cache-storage/cross-partition.https.tentative.html [ Pass Failure Crash ]

webkit.org/b/247982 [ Ventura+ ] fast/images/animated-heics-draw.html [ Timeout ]

webkit.org/b/248997 [ BigSur+ ] http/tests/navigation/fragment-navigation-policy-ignore.html [ Pass Failure ]

webkit.org/b/249407 [ BigSur+ ] media/audioSession/getUserMedia.html [ Failure ]
Expand Down
2 changes: 1 addition & 1 deletion Source/WebKit/UIProcess/Cocoa/WebProcessPoolCocoa.mm
Original file line number Diff line number Diff line change
Expand Up @@ -508,7 +508,7 @@ static bool determineIfWeShouldCrashWhenCreatingWebProcess()

#if HAVE(VIDEO_RESTRICTED_DECODING)
#if PLATFORM(MAC)
if (!isFullWebBrowser()) {
if (!isFullWebBrowser() || isRunningTest(WebCore::applicationBundleIdentifier())) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why does our test tool evaluate to true for isFullWebBrowser()?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That is a good point. I think this was originally done to have WebKitTestRunner exercise the same code paths as Safari for certain tests. An alternative would be to add the isRunningTest check to places where we'd like to use the same code paths.

Thanks for reviewing!

if (auto trustdExtensionHandle = SandboxExtension::createHandleForMachLookup("com.apple.trustd.agent"_s, std::nullopt))
parameters.trustdExtensionHandle = WTFMove(*trustdExtensionHandle);
parameters.enableDecodingHEIC = true;
Expand Down