summaryrefslogtreecommitdiffstats
path: root/chrome/browser/browser_process_impl.h
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 01:12:09 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-04-21 01:12:09 +0000
commit363b3b0800174428306597483e0f42ea8f502ad3 (patch)
tree9cca1044c75f516905893b15c5c5dbde7ae9b0e6 /chrome/browser/browser_process_impl.h
parentb01998a811ed26bee97b9fb51358235af54a53ac (diff)
downloadchromium_src-363b3b0800174428306597483e0f42ea8f502ad3.zip
chromium_src-363b3b0800174428306597483e0f42ea8f502ad3.tar.gz
chromium_src-363b3b0800174428306597483e0f42ea8f502ad3.tar.bz2
Linux: move X operations from the IO to UI2 thread.
Currently we perform several X operations on the IO thread including geometry and clipboard work. This is causing races inside Xlib and crashing the browser. These are the result of synchronous calls from the renderer, so we cannot route these requests to the UI thread without risking deadlock. Thus we introduce the UI2 thread. This thread has a second connection to the X server and can perform X operations safely the without UI thread. Work remains to be done: Since we still have the hack where we pass GtkWidget pointers into the renderer and back, we still have to access these structures from the IO and UI2 threads. This still needs to be fixed, but this is not the patch for it. Also, not all the X calls from the IO thread have been moved over in this patch; just a few small ones. http://codereview.chromium.org/67145 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@14075 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browser_process_impl.h')
-rw-r--r--chrome/browser/browser_process_impl.h14
1 files changed, 14 insertions, 0 deletions
diff --git a/chrome/browser/browser_process_impl.h b/chrome/browser/browser_process_impl.h
index 55b9dc2..0550ad9 100644
--- a/chrome/browser/browser_process_impl.h
+++ b/chrome/browser/browser_process_impl.h
@@ -73,6 +73,16 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
return db_thread_.get();
}
+#if defined(OS_LINUX)
+ virtual base::Thread* background_x11_thread() {
+ DCHECK(CalledOnValidThread());
+ // The BACKGROUND_X11 thread is created when the IO thread is created.
+ if (!created_io_thread_)
+ CreateIOThread();
+ return background_x11_thread_.get();
+ }
+#endif
+
virtual ProfileManager* profile_manager() {
DCHECK(CalledOnValidThread());
if (!created_profile_manager_)
@@ -211,6 +221,10 @@ class BrowserProcessImpl : public BrowserProcess, public NonThreadSafe {
bool created_io_thread_;
scoped_ptr<base::Thread> io_thread_;
+#if defined(OS_LINUX)
+ // This shares a created flag with the IO thread.
+ scoped_ptr<base::Thread> background_x11_thread_;
+#endif
bool created_file_thread_;
scoped_ptr<base::Thread> file_thread_;