content/renderer/pepper/pepper_media_stream_track_host_base.cc - Issue 1154613006: Update pepper to not assume that SharedMemoryHandle is an int.

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: content/renderer/pepper/pepper_media_stream_track_host_base.cc

Issue 1154613006: Update pepper to not assume that SharedMemoryHandle is an int. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Remove changes to base/memory. Created 5 years, 7 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

« content/renderer/pepper/pepper_compositor_host.cc ('K') | « content/renderer/pepper/pepper_compositor_host.cc ('k') | content/renderer/pepper/pepper_platform_audio_input.cc » ('j') | content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/pepper_media_stream_track_host_base.cc

diff --git a/content/renderer/pepper/pepper_media_stream_track_host_base.cc b/content/renderer/pepper/pepper_media_stream_track_host_base.cc

index c9a75f6ffcafc0f3013152c182721843fcf52c0f..7846bfdb530b9af4f990aacb6642ad5a04c15276 100644

--- a/content/renderer/pepper/pepper_media_stream_track_host_base.cc

+++ b/content/renderer/pepper/pepper_media_stream_track_host_base.cc

@@ -63,9 +63,7 @@ bool PepperMediaStreamTrackHostBase::InitBuffers(int32_t number_of_buffers,

return false;

}

- base::PlatformFile platform_file =

- PlatformFileFromSharedMemoryHandle(shm_handle);

- SerializedHandle handle(host_->ShareHandleWithRemote(platform_file, false),

+ SerializedHandle handle(host_->ShareSharedMemoryHandleWithRemote(shm_handle),

size.ValueOrDie());

bool readonly = (track_type == kRead);

host()->SendUnsolicitedReplyWithHandles(