diff options
| author | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 04:20:03 +0000 |
|---|---|---|
| committer | ccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-11 04:20:03 +0000 |
| commit | 27af383b79a59f3c947e68a1c05f919678883d4f (patch) | |
| tree | 3a00745da1cdc81e4f5f323b33a40965cbdf3177 /content/gpu | |
| parent | 0d321df097b9355ce073906581b2c5e6524c4f0a (diff) | |
| download | chromium_src-27af383b79a59f3c947e68a1c05f919678883d4f.zip chromium_src-27af383b79a59f3c947e68a1c05f919678883d4f.tar.gz chromium_src-27af383b79a59f3c947e68a1c05f919678883d4f.tar.bz2 | |
Use an X event loop in the GPU process on Linux.
In future patches, X windows will be created in the GPU
process, and events sent to these windows will need to
be forwarded to their parent windows.
Linux uses GTK as the default UI event loop type, but
GTK is not in the GPU process, so the X11 event loop
type is used instead.
BUG=145600
Review URL: https://chromiumcodereview.appspot.com/23477050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222470 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu')
| -rw-r--r-- | content/gpu/gpu_main.cc | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc index da063d8..9e29e03 100644 --- a/content/gpu/gpu_main.cc +++ b/content/gpu/gpu_main.cc @@ -146,6 +146,8 @@ int GpuMain(const MainFunctionParams& parameters) { gfx::kGLImplementationDesktopName) { message_loop_type = base::MessageLoop::TYPE_UI; } +#elif defined(TOOLKIT_GTK) + message_loop_type = base::MessageLoop::TYPE_GPU; #elif defined(OS_LINUX) message_loop_type = base::MessageLoop::TYPE_DEFAULT; #endif |