Source/web/WebMediaPlayerClientImpl.cpp - Issue 600143005: Rename onneedkey event to onencrypted.

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: Source/web/WebMediaPlayerClientImpl.cpp

Issue 600143005: Rename onneedkey event to onencrypted. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Created 6 years, 3 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: Source/web/WebMediaPlayerClientImpl.cpp

diff --git a/Source/web/WebMediaPlayerClientImpl.cpp b/Source/web/WebMediaPlayerClientImpl.cpp

index e326a2e30c029c7236e0957bc7e2f353dcb365f8..e799ccb3afe5effb25fc8952b083b1ab1251f6ea 100644

--- a/Source/web/WebMediaPlayerClientImpl.cpp

+++ b/Source/web/WebMediaPlayerClientImpl.cpp

@@ -11,7 +11,6 @@

#include "core/rendering/RenderView.h"

#include "core/rendering/compositing/RenderLayerCompositor.h"

#include "modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h"

-#include "modules/encryptedmedia/MediaKeyNeededEvent.h"

#include "modules/mediastream/MediaStreamRegistry.h"

#include "platform/audio/AudioBus.h"

#include "platform/audio/AudioSourceProviderClient.h"

@@ -124,9 +123,9 @@ void WebMediaPlayerClientImpl::keyMessage(const WebString& keySystem, const WebS

HTMLMediaElementEncryptedMedia::keyMessage(mediaElement(), keySystem, sessionId, message, messageLength, defaultURL);

}

-void WebMediaPlayerClientImpl::keyNeeded(const WebString& contentType, const unsigned char* initData, unsigned initDataLength)

+void WebMediaPlayerClientImpl::keyNeeded(const WebString& initDataType, const unsigned char* initData, unsigned initDataLength)

{

- HTMLMediaElementEncryptedMedia::keyNeeded(mediaElement(), contentType, initData, initDataLength);

+ HTMLMediaElementEncryptedMedia::keyNeeded(mediaElement(), initDataType, initData, initDataLength);

}

void WebMediaPlayerClientImpl::setWebLayer(WebLayer* layer)