content/renderer/pepper/renderer_ppapi_host_impl.cc - Issue 1166443004: Further clean up pepper's use of SharedMemory.

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/renderer_ppapi_host_impl.cc

Issue 1166443004: Further clean up pepper's use of SharedMemory. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@shared_memory_make_class3_base

Patch Set: Fix compile error on windows. 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_proxy_channel_delegate_impl.cc ('K') | « content/renderer/pepper/pepper_proxy_channel_delegate_impl.cc ('k') | ppapi/proxy/ppapi_proxy_test.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/renderer_ppapi_host_impl.cc

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

index 2aa2c34d9f3189734a5caf32ed1aaa347c03dd04..ff8e819ec370c61887e9c5863c94ab648ec825c8 100644

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

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

@@ -234,15 +234,11 @@ IPC::PlatformFileForTransit RendererPpapiHostImpl::ShareHandleWithRemote(

base::SharedMemoryHandle

RendererPpapiHostImpl::ShareSharedMemoryHandleWithRemote(

const base::SharedMemoryHandle& handle) {

- base::PlatformFile local_platform_file =

-#if defined(OS_POSIX)

- handle.fd;

-#elif defined(OS_WIN)

- handle;

-#else

-#error Not implemented.

-#endif

- return ShareHandleWithRemote(local_platform_file, false);

+ if (!dispatcher_) {

+ DCHECK(is_running_in_process_);

+ return base::SharedMemory::DuplicateHandle(handle);

+ }

+ return dispatcher_->ShareSharedMemoryHandleWithRemote(handle);

}

bool RendererPpapiHostImpl::IsRunningInProcess() const {