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

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/MediaKeySystemAccess.cpp ('k') | third_party/WebKit/Source/modules/encryptedmedia/MediaKeys.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 05f7972eac3bab1ef741eb701122bd2997c2ed18..8541355807d97fb4d3218d31136e8dd2414ee4df 100644

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

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

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

#include "public/platform/WebVector.h"

#include "wtf/Forward.h"

#include "wtf/text/WTFString.h"

-#include <memory>

namespace blink {

@@ -55,7 +54,7 @@ class MediaKeys : public GarbageCollectedFinalized<MediaKeys>, public ActiveScri

USING_GARBAGE_COLLECTED_MIXIN(MediaKeys);

DEFINE_WRAPPERTYPEINFO();

public:

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

+ static MediaKeys* create(ExecutionContext*, const WebVector<WebEncryptedMediaSessionType>& supportedSessionTypes, PassOwnPtr<WebContentDecryptionModule>);

~MediaKeys() override;

MediaKeySession* createSession(ScriptState*, const String& sessionTypeString, ExceptionState&);

@@ -92,14 +91,14 @@ public:

bool hasPendingActivity() const final;

private:

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

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

class PendingAction;

bool sessionTypeSupported(WebEncryptedMediaSessionType);

void timerFired(Timer<MediaKeys>*);

const WebVector<WebEncryptedMediaSessionType> m_supportedSessionTypes;

- std::unique_ptr<WebContentDecryptionModule> m_cdm;

+ OwnPtr<WebContentDecryptionModule> m_cdm;

// Keep track of the HTMLMediaElement that references this object. Keeping

// a WeakMember so that HTMLMediaElement's lifetime isn't dependent on