Chromium Code Reviews| Index: base/threading/thread_restrictions.h |
| diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h |
| index 0c50416c92a41abb7de7433f6de82933cd72738d..978946d43960670d93e39e4f3f97ed21f8ba4c96 100644 |
| --- a/base/threading/thread_restrictions.h |
| +++ b/base/threading/thread_restrictions.h |
| @@ -65,6 +65,7 @@ class SyncCallRestrictions; |
| namespace mus { |
| class CommandBufferClientImpl; |
| class CommandBufferLocal; |
| +class GpuService; |
| class GpuState; |
| } |
| namespace net { |
| @@ -215,6 +216,7 @@ class BASE_EXPORT ThreadRestrictions { |
| friend class mojo::SyncCallRestrictions; |
| friend class mus::CommandBufferClientImpl; |
| friend class mus::CommandBufferLocal; |
| + friend class mus::GpuService; // http://crbug.com/620058 |
|
jam
2016/06/22 23:55:50
is this a bad merge? you need to remove this from
Peng
2016/06/23 14:15:57
Done.
|
| friend class mus::GpuState; |
| // END ALLOWED USAGE. |