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

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

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

index 6042681340577de902849eb09263ca4cee159578..a8c497630e017ce3502f6b8e8203a9036f340389 100644

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

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

@@ -50,7 +50,6 @@

#include "public/platform/WebString.h"

#include "public/platform/WebURL.h"

#include "wtf/ASCIICType.h"

-#include "wtf/PtrUtil.h"

#include <cmath>

#include <limits>

@@ -332,7 +331,7 @@ MediaKeySession::MediaKeySession(ScriptState* scriptState, MediaKeys* mediaKeys,

// initializeNewSession() is called in response to the user calling

// generateRequest().

WebContentDecryptionModule* cdm = mediaKeys->contentDecryptionModule();

- m_session = wrapUnique(cdm->createSession());

+ m_session = adoptPtr(cdm->createSession());

m_session->setClientInterface(this);

// From https://w3c.github.io/encrypted-media/#createSession: