Bug 210331 - [EME][GStreamer] remove m_cdmInstance ASSERT in cdmInstanceDetached
Summary: [EME][GStreamer] remove m_cdmInstance ASSERT in cdmInstanceDetached
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: WebKitGTK (show other bugs)
Version: WebKit Nightly Build
Hardware: Unspecified Unspecified
: P2 Normal
Assignee: Charlie Turner
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2020-04-10 03:41 PDT by Charlie Turner
Modified: 2020-04-13 03:18 PDT (History)
13 users (show)

See Also:

Attachments
Patch (2.73 KB, patch)
2020-04-10 05:08 PDT, Charlie Turner 		no flags Details | Formatted Diff | Diff
Patch (2.73 KB, patch)
2020-04-10 07:40 PDT, Charlie Turner 		no flags Details | Formatted Diff | Diff
Patch (3.51 KB, patch)
2020-04-13 02:50 PDT, Charlie Turner 		no flags Details | Formatted Diff | Diff
Patch (2.86 KB, patch)
2020-04-13 02:52 PDT, Charlie Turner 		no flags Details | Formatted Diff | Diff
Show Obsolete (3) View All Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Charlie Turner 2020-04-10 03:41:16 PDT 
[EME][GStreamer] remove m_cdmInstance ASSERT in cdmInstanceDetached
Comment 1 Charlie Turner 2020-04-10 05:08:33 PDT 
Created attachment 396074 [details]
Patch
Comment 2 Charlie Turner 2020-04-10 07:40:13 PDT 
Created attachment 396081 [details]
Patch
Comment 3 Xabier Rodríguez Calvar 2020-04-10 08:10:16 PDT 
Comment on attachment 396081 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=396081&action=review

> Source/WebCore/platform/graphics/gstreamer/MediaPlayerPrivateGStreamer.cpp:-3788
> -    if (m_cdmInstance != &instance) {
> -        GST_WARNING("passed CDMInstance %p is different from stored one %p", &instance, m_cdmInstance.get());
> -        ASSERT_NOT_REACHED();
> -        return;
> -    }

I would still add this check inside the if, or even better, I would just bail out if (!m_cdmInstance).
Comment 4 Charlie Turner 2020-04-13 02:50:10 PDT 
Created attachment 396261 [details]
Patch
Comment 5 Charlie Turner 2020-04-13 02:52:16 PDT 
Created attachment 396262 [details]
Patch

Manually add the reviewer field
Comment 6 EWS 2020-04-13 03:18:33 PDT 
Committed r260001: <https://trac.webkit.org/changeset/260001>

All reviewed patches have been landed. Closing bug and clearing flags on attachment 396262 [details].