media/mojo/services/mojo_decryptor.cc - Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: media/mojo/services/mojo_decryptor.cc

Issue 1527183003: Change mojo enums to be scoped enums in the generated C++ bindings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@mojo-binding-equals

Patch Set: Created 4 years, 12 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« media/mojo/services/media_type_converters.cc ('K') | « media/mojo/services/mojo_cdm_service.cc ('k') | media/mojo/services/mojo_demuxer_stream_adapter.cc » ('j') | mojo/public/tools/bindings/generators/cpp_templates/enum_macros.tmpl » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: media/mojo/services/mojo_decryptor.cc

diff --git a/media/mojo/services/mojo_decryptor.cc b/media/mojo/services/mojo_decryptor.cc

index 7dd81362767404643153fd0a7e9ca0ce71cdbf4a..c898a6e1c3ee2f943399e09a8d4fb5ce21305f70 100644

--- a/media/mojo/services/mojo_decryptor.cc

+++ b/media/mojo/services/mojo_decryptor.cc

@@ -115,9 +115,9 @@ void MojoDecryptor::OnKeyAdded() {

void MojoDecryptor::OnBufferDecrypted(const DecryptCB& decrypt_cb,

interfaces::Decryptor::Status status,

interfaces::DecoderBufferPtr buffer) {

- DVLOG_IF(1, status != interfaces::Decryptor::STATUS_SUCCESS)

+ DVLOG_IF(1, status != interfaces::Decryptor::Status::SUCCESS)

<< __FUNCTION__ << "(" << status << ")";

- DVLOG_IF(3, status == interfaces::Decryptor::STATUS_SUCCESS) << __FUNCTION__;

+ DVLOG_IF(3, status == interfaces::Decryptor::Status::SUCCESS) << __FUNCTION__;

if (buffer.is_null()) {

decrypt_cb.Run(static_cast<Decryptor::Status>(status), nullptr);

@@ -132,9 +132,9 @@ void MojoDecryptor::OnAudioDecoded(

const AudioDecodeCB& audio_decode_cb,

interfaces::Decryptor::Status status,

mojo::Array<interfaces::AudioBufferPtr> audio_buffers) {

- DVLOG_IF(1, status != interfaces::Decryptor::STATUS_SUCCESS)

+ DVLOG_IF(1, status != interfaces::Decryptor::Status::SUCCESS)

<< __FUNCTION__ << "(" << status << ")";

- DVLOG_IF(3, status == interfaces::Decryptor::STATUS_SUCCESS) << __FUNCTION__;

+ DVLOG_IF(3, status == interfaces::Decryptor::Status::SUCCESS) << __FUNCTION__;

Decryptor::AudioFrames audio_frames;

for (size_t i = 0; i < audio_buffers.size(); ++i)

@@ -146,9 +146,9 @@ void MojoDecryptor::OnAudioDecoded(

void MojoDecryptor::OnVideoDecoded(const VideoDecodeCB& video_decode_cb,

interfaces::Decryptor::Status status,

interfaces::VideoFramePtr video_frame) {

- DVLOG_IF(1, status != interfaces::Decryptor::STATUS_SUCCESS)

+ DVLOG_IF(1, status != interfaces::Decryptor::Status::SUCCESS)

<< __FUNCTION__ << "(" << status << ")";

- DVLOG_IF(3, status == interfaces::Decryptor::STATUS_SUCCESS) << __FUNCTION__;

+ DVLOG_IF(3, status == interfaces::Decryptor::Status::SUCCESS) << __FUNCTION__;

if (video_frame.is_null()) {

video_decode_cb.Run(static_cast<Decryptor::Status>(status), nullptr);

return;