third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.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/platform/exported/WebMediaStreamTrack.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/platform/exported/WebMediaStreamSource.cpp ('k') | third_party/WebKit/Source/platform/exported/WebMediaStreamTrackSourcesRequest.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp

diff --git a/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp b/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp

index 7f3468f40f30b6a8c1bdc614ecd57a58f841587a..9111c56300fbbf6e2c3307adc3f3030e903131fc 100644

--- a/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp

+++ b/third_party/WebKit/Source/platform/exported/WebMediaStreamTrack.cpp

@@ -30,8 +30,6 @@

#include "public/platform/WebMediaStream.h"

#include "public/platform/WebMediaStreamSource.h"

#include "public/platform/WebString.h"

-#include "wtf/PtrUtil.h"

-#include <memory>

namespace blink {

@@ -39,7 +37,7 @@ namespace {

class TrackDataContainer : public MediaStreamComponent::TrackData {

public:

- explicit TrackDataContainer(std::unique_ptr<WebMediaStreamTrack::TrackData> extraData)

+ explicit TrackDataContainer(PassOwnPtr<WebMediaStreamTrack::TrackData> extraData)

: m_extraData(std::move(extraData))

{

}

@@ -51,7 +49,7 @@ namespace {

}

private:

- std::unique_ptr<WebMediaStreamTrack::TrackData> m_extraData;

+ OwnPtr<WebMediaStreamTrack::TrackData> m_extraData;

};

} // namespace

@@ -123,7 +121,7 @@ void WebMediaStreamTrack::setTrackData(TrackData* extraData)

{

ASSERT(!m_private.isNull());

- m_private->setTrackData(wrapUnique(new TrackDataContainer(wrapUnique(extraData))));

+ m_private->setTrackData(adoptPtr(new TrackDataContainer(adoptPtr(extraData))));

}

void WebMediaStreamTrack::setSourceProvider(WebAudioSourceProvider* provider)