diff options
author | Luis Hector Chavez <lhchavez@google.com> | 2016-07-15 16:23:21 -0700 |
---|---|---|
committer | Treehugger Robot <treehugger-gerrit@google.com> | 2016-07-27 16:41:28 +0000 |
commit | 0c4f26a46430b8c503c65f5cae1d2b6876d53e30 (patch) | |
tree | fb97dc88b72d681efeb9cfa1b8693a6183180ad9 /base/threading/thread_restrictions.h | |
parent | 0cfccb799ce68cc66d389e6885f8d73f95ee5c4f (diff) | |
download | libchrome-0c4f26a46430b8c503c65f5cae1d2b6876d53e30.tar.gz |
libchrome: Uprev the library to r405848 from Chromium
Pulled the latest and greatest version of libchrome from Chromium.
The merge was done against r405848 which corresponds to git commit
909e5d3ecab27bb09cc570c1c215d0221bd6fe53 of Jul 15, 2016
Notable changes are:
- base::Bind() now explicitly disallows captures in lambdas (which was
never allowed in the style guide).
- base::ListValue::iterator now exposes std::unique_ptr<base::Value>
instead of raw base::Value*.
BUG: 29104761
TEST: All tests in libchrome_test pass on dragonboard-eng build
Change-Id: I94b285a3be074efa30c4e71ae93c8f2a99fb0b87
Diffstat (limited to 'base/threading/thread_restrictions.h')
-rw-r--r-- | base/threading/thread_restrictions.h | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index d8e3cb1b55..4212a4b6eb 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -44,7 +44,7 @@ class ScopedAllowWaitForAndroidLayoutTests; class ScopedAllowWaitForDebugURL; class SoftwareOutputDeviceMus; class TextInputClientMac; -class RasterWorkerPool; +class CategorizedWorkerPool; } // namespace content namespace dbus { class Bus; @@ -53,9 +53,6 @@ namespace disk_cache { class BackendImpl; class InFlightIO; } -namespace gles2 { -class CommandBufferClientImpl; -} namespace gpu { class GpuChannelHost; } @@ -63,8 +60,10 @@ namespace mojo { namespace common { class MessagePumpMojo; } +class SyncCallRestrictions; } -namespace mus { +namespace ui { +class CommandBufferClientImpl; class CommandBufferLocal; class GpuState; } @@ -201,7 +200,7 @@ class BASE_EXPORT ThreadRestrictions { friend class ::ScopedAllowWaitForLegacyWebViewApi; friend class cc::CompletionEvent; friend class cc::SingleThreadTaskGraphRunner; - friend class content::RasterWorkerPool; + friend class content::CategorizedWorkerPool; friend class remoting::AutoThread; friend class ui::WindowResizeHelperMac; friend class MessagePumpDefault; @@ -211,10 +210,11 @@ class BASE_EXPORT ThreadRestrictions { friend class ThreadTestHelper; friend class PlatformThread; friend class android::JavaHandlerThread; - friend class gles2::CommandBufferClientImpl; friend class mojo::common::MessagePumpMojo; - friend class mus::CommandBufferLocal; - friend class mus::GpuState; + friend class mojo::SyncCallRestrictions; + friend class ui::CommandBufferClientImpl; + friend class ui::CommandBufferLocal; + friend class ui::GpuState; // END ALLOWED USAGE. // BEGIN USAGE THAT NEEDS TO BE FIXED. |