third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.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/platform/mediastream/MediaStreamComponent.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/platform/mediastream/MediaStreamCenter.cpp ('k') | third_party/WebKit/Source/platform/mediastream/MediaStreamDescriptor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h

diff --git a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h

index 87d2167e45b5f36694eb733d2c75cd715c3afc23..7c5f40600fa153642ac193b4d1b0cc034fde3b6e 100644

--- a/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h

+++ b/third_party/WebKit/Source/platform/mediastream/MediaStreamComponent.h

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

#include "wtf/Forward.h"

#include "wtf/ThreadingPrimitives.h"

#include "wtf/text/WTFString.h"

-#include <memory>

namespace blink {

@@ -79,7 +78,7 @@ public:

void setSourceProvider(WebAudioSourceProvider* provider) { m_sourceProvider.wrap(provider); }

TrackData* getTrackData() const { return m_trackData.get(); }

- void setTrackData(std::unique_ptr<TrackData> trackData) { m_trackData = std::move(trackData); }

+ void setTrackData(PassOwnPtr<TrackData> trackData) { m_trackData = std::move(trackData); }

void getSettings(WebMediaStreamTrack::Settings&);

DECLARE_TRACE();

@@ -115,7 +114,7 @@ private:

String m_id;

bool m_enabled;

bool m_muted;

- std::unique_ptr<TrackData> m_trackData;

+ OwnPtr<TrackData> m_trackData;

};

typedef HeapVector<Member<MediaStreamComponent>> MediaStreamComponentVector;