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

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

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

index e5c4f4119bd34d8b2370ce38ae005022b36aa089..c1c4e13ccad03808dda892b629f6da4625bf5537 100644

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

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

@@ -10,7 +10,6 @@

#include "modules/encryptedmedia/MediaKeySystemConfiguration.h"

#include "public/platform/WebContentDecryptionModuleAccess.h"

#include "wtf/Forward.h"

-#include <memory>

namespace blink {

@@ -18,7 +17,7 @@ class MediaKeySystemAccess final : public GarbageCollectedFinalized<MediaKeySyst

DEFINE_WRAPPERTYPEINFO();

public:

- MediaKeySystemAccess(const String& keySystem, std::unique_ptr<WebContentDecryptionModuleAccess>);

+ MediaKeySystemAccess(const String& keySystem, PassOwnPtr<WebContentDecryptionModuleAccess>);

virtual ~MediaKeySystemAccess();

const String& keySystem() const { return m_keySystem; }

@@ -29,7 +28,7 @@ public:

private:

const String m_keySystem;

- std::unique_ptr<WebContentDecryptionModuleAccess> m_access;

+ OwnPtr<WebContentDecryptionModuleAccess> m_access;

};

} // namespace blink