third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp - Issue 2080623002: Revert "Remove OwnPtr from Blink."

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: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp

Issue 2080623002: Revert "Remove OwnPtr from Blink." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 6 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

« no previous file with comments | « third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.h ('k') | third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp

diff --git a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp

index cb4bded0b03a82b517a5d5b606236cf16f13af6e..1668a8233b2498e7d3e58174d362555b78eda402 100644

--- a/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp

+++ b/third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp

@@ -38,7 +38,6 @@

#include "platform/Timer.h"

#include "public/platform/WebContentDecryptionModule.h"

#include "wtf/RefPtr.h"

-#include <memory>

#define MEDIA_KEYS_LOG_LEVEL 3

@@ -117,14 +116,14 @@ public:

}

};

-MediaKeys* MediaKeys::create(ExecutionContext* context, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, std::unique_ptr<WebContentDecryptionModule> cdm)

+MediaKeys* MediaKeys::create(ExecutionContext* context, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule> cdm)

{

MediaKeys* mediaKeys = new MediaKeys(context, supportedSessionTypes, std::move(cdm));

mediaKeys->suspendIfNeeded();

return mediaKeys;

}

-MediaKeys::MediaKeys(ExecutionContext* context, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, std::unique_ptr<WebContentDecryptionModule> cdm)

+MediaKeys::MediaKeys(ExecutionContext* context, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule> cdm)

: ActiveScriptWrappable(this)

, ActiveDOMObject(context)

, m_supportedSessionTypes(supportedSessionTypes)