Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: third_party/mojo/src/mojo/edk/system/platform_handle_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
Index: third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
diff --git a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
index 9e2e37d7aeb21cd68ff96c6b415d1a749b2b75b5..8e8cf6904d96450fb8f6223cabcc78996155d9fe 100644
--- a/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
+++ b/third_party/mojo/src/mojo/edk/system/platform_handle_dispatcher.h
@@ -48,14 +48,16 @@ class MOJO_SYSTEM_IMPL_EXPORT PlatformHandleDispatcher final
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;
- embedder::ScopedPlatformHandle platform_handle_;
+ embedder::ScopedPlatformHandle platform_handle_ MOJO_GUARDED_BY(mutex());
MOJO_DISALLOW_COPY_AND_ASSIGN(PlatformHandleDispatcher);
};

Powered by Google App Engine
This is Rietveld 408576698