Source/web/WebMediaPlayerClientImpl.h - Issue 647383002: [Speculative revert to fix browser_tests on Blink canaries.]

Side by Side Diff: Source/web/WebMediaPlayerClientImpl.h

Issue 647383002: [Speculative revert to fix browser_tests on Blink canaries.] (Closed) Base URL: svn://svn.chromium.org/blink/trunk

Patch Set: Created 6 years, 2 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « Source/modules/modules.gypi ('k') | Source/web/WebMediaPlayerClientImpl.cpp » ('j') | no next file with comments »

OLD	NEW
1 /*	1 /*

2 * Copyright (C) 2009 Google Inc. All rights reserved.	2 * Copyright (C) 2009 Google Inc. All rights reserved.

3 *	3 *

4 * Redistribution and use in source and binary forms, with or without	4 * Redistribution and use in source and binary forms, with or without

5 * modification, are permitted provided that the following conditions are	5 * modification, are permitted provided that the following conditions are

6 * met:	6 * met:

7 *	7 *

8 * * Redistributions of source code must retain the above copyright	8 * * Redistributions of source code must retain the above copyright

9 * notice, this list of conditions and the following disclaimer.	9 * notice, this list of conditions and the following disclaimer.

10 * * Redistributions in binary form must reproduce the above	10 * * Redistributions in binary form must reproduce the above

(...skipping 52 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
63 virtual void timeChanged() override;	63 virtual void timeChanged() override;

64 virtual void repaint() override;	64 virtual void repaint() override;

65 virtual void durationChanged() override;	65 virtual void durationChanged() override;

66 virtual void sizeChanged() override;	66 virtual void sizeChanged() override;

67 virtual void playbackStateChanged() override;	67 virtual void playbackStateChanged() override;

68	68

69 // WebEncryptedMediaPlayerClient methods:	69 // WebEncryptedMediaPlayerClient methods:

70 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) override;	70 virtual void keyAdded(const WebString& keySystem, const WebString& sessionId ) override;

71 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) override;	71 virtual void keyError(const WebString& keySystem, const WebString& sessionId , MediaKeyErrorCode, unsigned short systemCode) override;

72 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) override;	72 virtual void keyMessage(const WebString& keySystem, const WebString& session Id, const unsigned char* message, unsigned messageLength, const WebURL& defaultU RL) override;

73 // FIXME: Remove keyNeeded() once rename to encrypted() is complete.

74 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) override;	73 virtual void keyNeeded(const WebString& contentType, const unsigned char* in itData, unsigned initDataLength) override;

75 virtual void encrypted(const WebString& initDataType, const unsigned char* i nitData, unsigned initDataLength) override;

76	74

77 virtual void setWebLayer(WebLayer*) override;	75 virtual void setWebLayer(WebLayer*) override;

78 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) override ;	76 virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrac kKind, const WebString& label, const WebString& language, bool enabled) override ;

79 virtual void removeAudioTrack(WebMediaPlayer::TrackId) override;	77 virtual void removeAudioTrack(WebMediaPlayer::TrackId) override;

80 virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrac kKind, const WebString& label, const WebString& language, bool selected) overrid e;	78 virtual WebMediaPlayer::TrackId addVideoTrack(const WebString& id, VideoTrac kKind, const WebString& label, const WebString& language, bool selected) overrid e;

81 virtual void removeVideoTrack(WebMediaPlayer::TrackId) override;	79 virtual void removeVideoTrack(WebMediaPlayer::TrackId) override;

82 virtual void addTextTrack(WebInbandTextTrack*) override;	80 virtual void addTextTrack(WebInbandTextTrack*) override;

83 virtual void removeTextTrack(WebInbandTextTrack*) override;	81 virtual void removeTextTrack(WebInbandTextTrack*) override;

84 virtual void mediaSourceOpened(WebMediaSource*) override;	82 virtual void mediaSourceOpened(WebMediaSource*) override;

85 virtual void requestFullscreen() override;	83 virtual void requestFullscreen() override;

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
152 Mutex provideInputLock;	150 Mutex provideInputLock;

153 };	151 };

154	152

155 AudioSourceProviderImpl m_audioSourceProvider;	153 AudioSourceProviderImpl m_audioSourceProvider;

156 #endif	154 #endif

157 };	155 };

158	156

159 } // namespace blink	157 } // namespace blink

160	158

161 #endif	159 #endif

OLD	NEW