Skip to content
Permalink
Browse files
[WPE] Layout test media/encrypted-media/mock-MediaKeySystemAccess.htm…
…l is crashing

https://bugs.webkit.org/show_bug.cgi?id=181225

Reviewed by Darin Adler.

Source/WebCore:

WebCore::CDM::createInstance assumes its private instance always
produces a valid pointer. This is not the case in the testing
mocks. Guard against it.

Test: media/encrypted-media/mock-MediaKeySystemAccess.html

* Modules/encryptedmedia/CDM.cpp:
(WebCore::CDM::createInstance): Guard against null pointers in
mock scenarios.

LayoutTests:

* platform/gtk/TestExpectations: The test is no longer crashing.
* platform/wpe/TestExpectations: Ditto.


Canonical link: https://commits.webkit.org/224615@main
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@261469 268f45cc-cd09-0410-ab3c-d52691b4dbfc
  • Loading branch information
charlie-ht committed May 11, 2020
1 parent 7b467a9 commit 8138093caa602ebc5a916e504141a7295eb1d9a9
Showing 5 changed files with 29 additions and 4 deletions.
@@ -1,3 +1,13 @@
2020-05-11 Charlie Turner <cturner@igalia.com>

[WPE] Layout test media/encrypted-media/mock-MediaKeySystemAccess.html is crashing
https://bugs.webkit.org/show_bug.cgi?id=181225

Reviewed by Darin Adler.

* platform/gtk/TestExpectations: The test is no longer crashing.
* platform/wpe/TestExpectations: Ditto.

2020-05-10 Diego Pino Garcia <dpino@igalia.com>

[GTK] Gardening, update test expectations
@@ -1582,7 +1582,6 @@ webkit.org/b/186779 http/tests/security/sandboxed-iframe-DENIED-modals.html [ Cr

webkit.org/b/188406 [ Debug ] imported/w3c/web-platform-tests/html/semantics/selectors/pseudo-classes/dir.html [ Crash ]

webkit.org/b/190578 media/encrypted-media/mock-MediaKeySystemAccess.html [ Crash ]
webkit.org/b/190738 imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html [ Crash Pass Failure ]
webkit.org/b/191882 fast/forms/validation-message-clone.html [ Failure Crash Pass ]
webkit.org/b/191882 fast/forms/validation-message-in-relative-body.html [ Failure Crash ]
@@ -1101,8 +1101,6 @@ imported/w3c/web-platform-tests/html/rendering/replaced-elements/embedded-conten
# 5. TESTS CRASHING
#////////////////////////////////////////////////////////////////////////////////////////

webkit.org/b/181225 media/encrypted-media/mock-MediaKeySystemAccess.html [ Crash ]

webkit.org/b/185591 [ Debug ] imported/w3c/web-platform-tests/encrypted-media/clearkey-mp4-playback-retrieve-persistent-license.https.html [ Crash ]

webkit.org/b/188161 [ Debug ] fast/canvas/webgl/context-lost-restored.html [ Crash ]
@@ -1,3 +1,20 @@
2020-05-11 Charlie Turner <cturner@igalia.com>

[WPE] Layout test media/encrypted-media/mock-MediaKeySystemAccess.html is crashing
https://bugs.webkit.org/show_bug.cgi?id=181225

Reviewed by Darin Adler.

WebCore::CDM::createInstance assumes its private instance always
produces a valid pointer. This is not the case in the testing
mocks. Guard against it.

Test: media/encrypted-media/mock-MediaKeySystemAccess.html

* Modules/encryptedmedia/CDM.cpp:
(WebCore::CDM::createInstance): Guard against null pointers in
mock scenarios.

2020-05-10 Rob Buis <rbuis@igalia.com>

Fix base64.any.html test
@@ -113,7 +113,8 @@ RefPtr<CDMInstance> CDM::createInstance()
if (!m_private)
return nullptr;
auto instance = m_private->createInstance();
instance->setStorageDirectory(storageDirectory());
if (instance)
instance->setStorageDirectory(storageDirectory());
return instance;
}

0 comments on commit 8138093

Please sign in to comment.