media/formats/webm/webm_content_encodings_client.h - Issue 1235793005: Deprecate LogCB in favor of using MediaLog

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/formats/webm/webm_content_encodings_client.h

Issue 1235793005: Deprecate LogCB in favor of using MediaLog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address comments and attempt to fix Android compilation Created 5 years, 5 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:

Index: media/formats/webm/webm_content_encodings_client.h

diff --git a/media/formats/webm/webm_content_encodings_client.h b/media/formats/webm/webm_content_encodings_client.h

index 4b1bfe03ec2691b1011f81f2dcbb44cbe6338ad3..85f7bf329a88e5e39e2e58cceba5f2596a1b760d 100644

--- a/media/formats/webm/webm_content_encodings_client.h

+++ b/media/formats/webm/webm_content_encodings_client.h

@@ -22,7 +22,7 @@ typedef std::vector<ContentEncoding*> ContentEncodings;

// Parser for WebM ContentEncodings element.

class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient {

public:

- explicit WebMContentEncodingsClient(const LogCB& log_cb);

+ explicit WebMContentEncodingsClient(const scoped_refptr<MediaLog>& media_log);

~WebMContentEncodingsClient() override;

const ContentEncodings& content_encodings() const;

@@ -34,7 +34,7 @@ class MEDIA_EXPORT WebMContentEncodingsClient : public WebMParserClient {

bool OnBinary(int id, const uint8* data, int size) override;

private:

- LogCB log_cb_;

+ scoped_refptr<MediaLog> media_log_;

scoped_ptr<ContentEncoding> cur_content_encoding_;

bool content_encryption_encountered_;

ContentEncodings content_encodings_;