third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h - Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

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/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h

Issue 1296453004: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: cherry-pick GL_APIENTRY addition back in Created 5 years, 4 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/mojo/src/mojo/edk/system/raw_channel_unittest.cc ('k') | third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h

diff --git a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h

index deef5b4472824082130d478288a43313f74fdd77..1222e030c185364ce3347b229a2bdcaa9c230141 100644

--- a/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h

+++ b/third_party/mojo/src/mojo/edk/system/shared_buffer_dispatcher.h

@@ -93,14 +93,17 @@ class MOJO_SYSTEM_IMPL_EXPORT SharedBufferDispatcher final

scoped_ptr<embedder::PlatformSharedBufferMapping>* mapping) override;

void StartSerializeImplNoLock(Channel* channel,

size_t* max_size,

- size_t* max_platform_handles) override;

+ size_t* max_platform_handles) override

+ MOJO_NOT_THREAD_SAFE;

bool EndSerializeAndCloseImplNoLock(

Channel* channel,

void* destination,

size_t* actual_size,

- embedder::PlatformHandleVector* platform_handles) override;

+ embedder::PlatformHandleVector* platform_handles) override

+ MOJO_NOT_THREAD_SAFE;

- scoped_refptr<embedder::PlatformSharedBuffer> shared_buffer_;

+ scoped_refptr<embedder::PlatformSharedBuffer> shared_buffer_

+ MOJO_GUARDED_BY(mutex());

MOJO_DISALLOW_COPY_AND_ASSIGN(SharedBufferDispatcher);

};