Index: mojo/public/cpp/bindings/sync_call_restrictions.h |
diff --git a/mojo/public/cpp/bindings/sync_call_restrictions.h b/mojo/public/cpp/bindings/sync_call_restrictions.h |
index 6ed1946ce3aef8a1b1e05fda471f64b811835fb1..cf0be087bdaa5493a22aabb61fb4afd43ce6f39f 100644 |
--- a/mojo/public/cpp/bindings/sync_call_restrictions.h |
+++ b/mojo/public/cpp/bindings/sync_call_restrictions.h |
@@ -33,6 +33,7 @@ class PersistentPrefStoreClient; |
namespace ui { |
class Gpu; |
+class ServerGpuMemoryBufferManager; |
} |
namespace views { |
@@ -49,10 +50,10 @@ namespace mojo { |
// Before processing a sync call, the bindings call |
// SyncCallRestrictions::AssertSyncCallAllowed() to check whether sync calls are |
// allowed. By default, it is determined by the mojo system property |
-// MOJO_PROPERTY_SYNC_CALL_ALLOWED. If the default setting says no but you have |
-// a very compelling reason to disregard that (which should be very very rare), |
-// you can override it by constructing a ScopedAllowSyncCall object, which |
-// allows making sync calls on the current thread during its lifetime. |
+// MOJO_PROPERTY_TYPE_SYNC_CALL_ALLOWED. If the default setting says no but you |
+// have a very compelling reason to disregard that (which should be very very |
+// rare), you can override it by constructing a ScopedAllowSyncCall object, |
+// which allows making sync calls on the current thread during its lifetime. |
class MOJO_CPP_BINDINGS_EXPORT SyncCallRestrictions { |
public: |
#if ENABLE_SYNC_CALL_RESTRICTIONS |
@@ -60,7 +61,8 @@ class MOJO_CPP_BINDINGS_EXPORT SyncCallRestrictions { |
// a DCHECK if not. |
static void AssertSyncCallAllowed(); |
#else |
- // Inline the empty definitions of functions so that they can be compiled out. |
+ // Inline the empty dServerGpuMemoryBufferManagerefinitions of functions so |
+ // that they can be compiled out. |
static void AssertSyncCallAllowed() {} |
#endif |
@@ -69,6 +71,7 @@ class MOJO_CPP_BINDINGS_EXPORT SyncCallRestrictions { |
// BEGIN ALLOWED USAGE. |
friend class content::BrowserTestBase; // Test-only. |
friend class ui::Gpu; // http://crbug.com/620058 |
+ friend class ui::ServerGpuMemoryBufferManager; |
// LevelDBMojoProxy makes same-process sync calls from the DB thread. |
friend class leveldb::LevelDBMojoProxy; |
// Pref service connection is sync at startup. |