Bug 129164 – Make a generic CDMPrivateMediaPlayer and move its CDMSession into platform/.

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Jer Noble]

Make a generic CDMPrivateMediaPlayer and move its CDMSession into platform/.

[Jer Noble]

Created attachment 224895 [details]
Patch

[WebKit Commit Bot]

Attachment 224895 [details] did not pass style-queue:


ERROR: Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:54:  Should be indented on a separate line, with the colon or comma first on that line.  [whitespace/indent] [4]
Total errors found: 1 in 12 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Jer Noble]

Created attachment 224896 [details]
Patch

[WebKit Commit Bot]

Attachment 224896 [details] did not pass style-queue:


ERROR: Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:54:  Should be indented on a separate line, with the colon or comma first on that line.  [whitespace/indent] [4]
Total errors found: 1 in 17 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Jer Noble]

Created attachment 224897 [details]
Patch

More PassRefPtr -> std::unique_ptr changes.

[WebKit Commit Bot]

Attachment 224897 [details] did not pass style-queue:


ERROR: Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:54:  Should be indented on a separate line, with the colon or comma first on that line.  [whitespace/indent] [4]
Total errors found: 1 in 19 files


If any of these errors are false positives, please file a bug against check-webkit-style.

[Eric Carlson]

Comment on attachment 224897 [details]
Patch

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

> Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:2
> + * Copyright (C) 2012 Apple Inc. All rights reserved.

Nit: you might as well update this.

> Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:2
> + * Copyright (C) 2012 Apple Inc. All rights reserved.

Ditto.

> Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:41
> +    // CDMFactory support:

Nit: this isn't terribly informative.

> Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:42
> +    static PassOwnPtr<CDMPrivateInterface> create(CDM* cdm) { return adoptPtr(new CDMPrivateMediaPlayer(cdm)); }

Can be converted to std::unique_ptr as well?

> Source/WebCore/platform/graphics/CDMSession.h:2
> + * Copyright (C) 2013]4 Apple Inc. All rights reserved.

2013]4 - when was/is :-) ?

> Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:49
> +
> +

Nit: extra blank line.

> Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:66
> +        return 0;

nullptr.

> Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:84
> +        return 0;

Ditto.

> Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:89
> +    errorCode = MediaPlayer::NoError;
> +    systemCode = 0;
> +    destinationURL = String();

These don't seem to be used.

> Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:106
> +    errorCode = MediaPlayer::NoError;
> +    systemCode = 0;
> +    nextMessage = nullptr;

Ditto.

[Jer Noble]

(In reply to comment #7)
> (From update of attachment 224897 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=224897&action=review
> 
> > Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.cpp:2
> > + * Copyright (C) 2012 Apple Inc. All rights reserved.
> 
> Nit: you might as well update this.

Ok.

> > Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:2
> > + * Copyright (C) 2012 Apple Inc. All rights reserved.
> 
> Ditto.

Ok.

> > Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:41
> > +    // CDMFactory support:
> 
> Nit: this isn't terribly informative.

Removed.

> > Source/WebCore/Modules/encryptedmedia/CDMPrivateMediaPlayer.h:42
> > +    static PassOwnPtr<CDMPrivateInterface> create(CDM* cdm) { return adoptPtr(new CDMPrivateMediaPlayer(cdm)); }
> 
> Can be converted to std::unique_ptr as well?

Yep!

> > Source/WebCore/platform/graphics/CDMSession.h:2
> > + * Copyright (C) 2013]4 Apple Inc. All rights reserved.
> 
> 2013]4 - when was/is :-) ?

The future!

> > Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:49
> > +
> > +
> 
> Nit: extra blank line.

Deleted.

> > Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:66
> > +        return 0;
> 
> nullptr.

Changed.

> > Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:84
> > +        return 0;
> 
> Ditto.

Ditto.

> > Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:89
> > +    errorCode = MediaPlayer::NoError;
> > +    systemCode = 0;
> > +    destinationURL = String();
> 
> These don't seem to be used.

These are out parameters.

> > Source/WebCore/platform/graphics/avfoundation/objc/CDMSessionAVFoundationObjC.mm:106
> > +    errorCode = MediaPlayer::NoError;
> > +    systemCode = 0;
> > +    nextMessage = nullptr;
> 
> Ditto.

Ditto.

[Jer Noble]

Committed r164514: <http://trac.webkit.org/changeset/164514>