Bug 188303 – Return extracted key ids as an optional

• Status: RESOLVED
• Resolution: FIXED
• Component: Media

[Charlie Turner]

Return extracted key ids as an optional

[Charlie Turner]

Created attachment 346473 [details]
Patch

[Charlie Turner]

Created attachment 346475 [details]
Patch

Fix build error reported from iOS bot

[Charlie Turner]

Created attachment 346482 [details]
Patch

Fix more build errors reported from iOS bot

[Charlie Turner]

Created attachment 346486 [details]
Patch

Fix more iOS build errors, even though keyIDs() never returns a nullopt, I am still performing extra checking for the absence of a value in case FPS at some point starts handling init data types that do not guarantee key IDs

[Charlie Turner]

Created attachment 346488 [details]
Patch

It was not necessary to percolate the sentinel complication throughout the FairPlayStreaming module

[Charlie Turner]

Created attachment 346490 [details]
Patch

More iOS build errors

[Darin Adler]

Comment on attachment 346490 [details]
Patch

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

> Source/WebCore/testing/MockCDMFactory.cpp:286
> +    if (!keyIDs || (keyIDs && keyIDs.value().isEmpty())) {

No need to use && here.

    if (!keyIDs || keyIDs.value().isEmpty()) {

[Charlie Turner]

Created attachment 346624 [details]
Patch

Move the key ids rather than attempting a copy, which fails with the Vector of Refs, added logical cleanup suggested by Darin.

[WebKit Commit Bot]

Comment on attachment 346624 [details]
Patch

Clearing flags on attachment: 346624

Committed r234603: <https://trac.webkit.org/changeset/234603>

[WebKit Commit Bot]

All reviewed patches have been landed.  Closing bug.

[Radar WebKit Bug Importer]

<rdar://problem/42971214>