Rename cdm::OutputBuffer to DecryptedBlock.

Rename cdm::OutputBuffer to DecryptedBlock.

The replacement class is an interface, and is implemented in cdm_wrapper.
Also renames cdm::Buffer's buffer method to data for clarity at call sites
(former name could result in calls like buffer->buffer()->buffer()).

BUG=
TEST=


Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=159626

[Tom Finegan, 2012-09-30 02:24:08]

PTAL!

[ddorwin, 2012-10-01 01:51:14]

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
File webkit/media/crypto/ppapi/cdm_wrapper.cc (right):

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/cdm_wrapper.cc:111: virtual cdm::Buffer* buffer()
const OVERRIDE;
returned pointer should be const if method is const. otherwise, misleading.

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
File webkit/media/crypto/ppapi/content_decryption_module.h (right):

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:308: // Represents a
decrypted buffer.
decrypted but not decoded?

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:320: DecryptedBlock() {}
Do we need the constructors? It can't be instantiated anyway.

[xhwang, 2012-10-01 06:10:05]

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
File webkit/media/crypto/ppapi/content_decryption_module.h (right):

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:308: // Represents a
decrypted buffer.
s/buffer/block ?

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:315: // we can just pass
Buffer*s around.
s/*/' ?

[Tom Finegan, 2012-10-01 19:24:40]

PTAL! Thanks.

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
File webkit/media/crypto/ppapi/cdm_wrapper.cc (right):

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/cdm_wrapper.cc:111: virtual cdm::Buffer* buffer()
const OVERRIDE;
On 2012/10/01 01:51:14, ddorwin wrote:
> returned pointer should be const if method is const. otherwise, misleading.

Done, also updated KeyMessage/KeyMessageImpl (same issue).

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
File webkit/media/crypto/ppapi/content_decryption_module.h (right):

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:308: // Represents a
decrypted buffer.
On 2012/10/01 01:51:14, ddorwin wrote:
> decrypted but not decoded?

Done.

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:308: // Represents a
decrypted buffer.
On 2012/10/01 06:10:05, xhwang wrote:
> s/buffer/block ?

Done.

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:315: // we can just pass
Buffer*s around.
On 2012/10/01 06:10:05, xhwang wrote:
> s/*/' ?

Done. I was saying "Buffer pointers", so I just typed it out instead of leaving
it at "Buffer*s".

http://codereview.chromium.org/11018007/diff/2001/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:320: DecryptedBlock() {}
On 2012/10/01 01:51:14, ddorwin wrote:
> Do we need the constructors? It can't be instantiated anyway.

Removed. Same change made to KeyMessage.

[ddorwin, 2012-10-01 19:38:34]

LG except the destructors.

http://codereview.chromium.org/11018007/diff/13001/webkit/media/crypto/ppapi/...
File webkit/media/crypto/ppapi/content_decryption_module.h (right):

http://codereview.chromium.org/11018007/diff/13001/webkit/media/crypto/ppapi/...
webkit/media/crypto/ppapi/content_decryption_module.h:317: virtual int64_t
timestamp() const = 0;
You still need protected (and virtual for good measure) destructors to prevent
the CDM from deleting these objects. Here and below.

[Tom Finegan, 2012-10-01 19:52:30]

Replaced the dtors...

http://codereview.chromium.org/11018007/diff/13001/webkit/media/crypto/ppapi/...
File webkit/media/crypto/ppapi/content_decryption_module.h (right):

http://codereview.chromium.org/11018007/diff/13001/webkit/media/crypto/ppapi/...
webkit/media/crypto/ppapi/content_decryption_module.h:317: virtual int64_t
timestamp() const = 0;
On 2012/10/01 19:38:34, ddorwin wrote:
> You still need protected (and virtual for good measure) destructors to prevent
> the CDM from deleting these objects. Here and below.

Done (oops).

[xhwang, 2012-10-01 21:12:04]

http://codereview.chromium.org/11018007/diff/7003/webkit/media/crypto/ppapi/c...
File webkit/media/crypto/ppapi/content_decryption_module.h (right):

http://codereview.chromium.org/11018007/diff/7003/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:320: virtual
~DecryptedBlock();
This looks good to me.

@ddorwin: The WebKit pattern we talked about is to use non-virtual destructor if
the object is never destroyed from base pointers. This is irrelevant to what we
are doing here.

http://codereview.chromium.org/11018007/diff/7003/webkit/media/crypto/ppapi/c...
webkit/media/crypto/ppapi/content_decryption_module.h:324: class KeyMessage {
Will we have other KeyMessage implementations other than KeyMessageImpl? If not,
remove the interface? (It's a convention in media code that if an interface only
has one implementation then don't use an interface.)

[Tom Finegan, 2012-10-01 22:29:34]

Destructor implementations replaced. PTAL, thanks.

[xhwang, 2012-10-01 22:35:13]

http://codereview.chromium.org/11018007/diff/15002/webkit/media/crypto/ppapi/...
File webkit/media/crypto/ppapi/content_decryption_module.h (right):

http://codereview.chromium.org/11018007/diff/15002/webkit/media/crypto/ppapi/...
webkit/media/crypto/ppapi/content_decryption_module.h:320: virtual
~DecryptedBlock() {}
Sorry for going back-and-forth. But having no ctor here but having one in
Allocator is not consistent. Can we put the default ctor back here under
protected (since we do this in most cases in chrome code)? Same for KeyMessage.

[Tom Finegan, 2012-10-01 22:41:43]

Replaced the ctors, and changed buffer() to data() in cdm::Buffer. PTAL, thanks!

[ddorwin, 2012-10-01 22:45:02]

lgtm

Yay!

[xhwang, 2012-10-01 22:47:39]

lgtm

[commit-bot: I haz the power, 2012-10-01 23:28:26]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11018007/7004

[commit-bot: I haz the power, 2012-10-02 00:43:26]

Retried try job too often for step(s) browser_tests

[commit-bot: I haz the power, 2012-10-02 00:48:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/[email protected]/11018007/7004

[commit-bot: I haz the power, 2012-10-02 02:43:28]

Change committed as 159626