diff options
| author | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 20:46:47 +0000 |
|---|---|---|
| committer | mazda@chromium.org <mazda@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 20:46:47 +0000 |
| commit | 906d9a61025ec7bcf2d888292594cb9861fb8687 (patch) | |
| tree | 6bea1eb39423ab18cd96c00fb5ac5072335ccabb /base | |
| parent | 73c7f71918be108fc4ef289a075bea783f12f173 (diff) | |
| download | chromium_src-906d9a61025ec7bcf2d888292594cb9861fb8687.zip chromium_src-906d9a61025ec7bcf2d888292594cb9861fb8687.tar.gz chromium_src-906d9a61025ec7bcf2d888292594cb9861fb8687.tar.bz2 | |
Fix debug asserts when --ui-use-gpu-process is specified.
BUG=125248,125264
TEST=Chrome debug build starts successfully with --ui-use-gpu-process
Review URL: https://chromiumcodereview.appspot.com/10209017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134342 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
| -rw-r--r-- | base/threading/thread_restrictions.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/base/threading/thread_restrictions.h b/base/threading/thread_restrictions.h index a330012..65002b7 100644 --- a/base/threading/thread_restrictions.h +++ b/base/threading/thread_restrictions.h @@ -10,6 +10,7 @@ class BrowserProcessImpl; class HistogramSynchronizer; +class GpuChannelHost; class MetricsService; class NativeBackendKWallet; class RenderWidgetHelper; @@ -30,6 +31,9 @@ class StatisticsProviderImpl; namespace chrome_browser_net { class Predictor; } +namespace content { +class BrowserGpuChannelHostFactory; +} namespace dbus { class Bus; } @@ -153,7 +157,7 @@ class BASE_EXPORT ThreadRestrictions { // DO NOT ADD ANY OTHER FRIEND STATEMENTS, talk to jam or brettw first. // BEGIN ALLOWED USAGE. friend class ::HistogramSynchronizer; - friend class ::RenderWidgetHelper; + friend class ::RenderWidgetHelper; friend class ::TestingAutomationProvider; friend class SequencedWorkerPool; friend class SimpleThread; @@ -167,6 +171,8 @@ class BASE_EXPORT ThreadRestrictions { friend class browser_sync::NonFrontendDataTypeController; // http://crbug.com/19757 friend class browser_sync::UIModelWorker; // http://crbug.com/19757 friend class chrome_browser_net::Predictor; // http://crbug.com/78451 + friend class + content::BrowserGpuChannelHostFactory; // http://crbug.com/125248 friend class dbus::Bus; // http://crbug.com/125222 friend class disk_cache::BackendImpl; // http://crbug.com/74623 friend class disk_cache::InFlightIO; // http://crbug.com/74623 @@ -176,6 +182,7 @@ class BASE_EXPORT ThreadRestrictions { friend class net::FileStreamWin; // http://crbug.com/115067 friend class net::NetworkManagerApi; // http://crbug.com/125097 friend class ::BrowserProcessImpl; // http://crbug.com/125207 + friend class ::GpuChannelHost; // http://crbug.com/125264 friend class ::MetricsService; // http://crbug.com/124954 friend class ::TextInputClientMac; // http://crbug.com/121917 friend class ::NativeBackendKWallet; // http://crbug.com/125331 |