summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authornoamsml@chromium.org <noamsml@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-11 17:52:41 +0000
committernoamsml@chromium.org <noamsml@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-09-11 17:52:41 +0000
commitf41b93747c8494945f2537d7922cfd90e0219472 (patch)
treece10842c05e701c2c2eab2bdcf79963c013ca68e /content
parentd64d4c8eae596c5827f022d016a25c34379369f6 (diff)
downloadchromium_src-f41b93747c8494945f2537d7922cfd90e0219472.zip
chromium_src-f41b93747c8494945f2537d7922cfd90e0219472.tar.gz
chromium_src-f41b93747c8494945f2537d7922cfd90e0219472.tar.bz2
Revert 222470 "Use an X event loop in the GPU process on Linux." This is to
check if it adds an unexpected dependency on libxi6. > 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 TBR=ccameron@chromium.org Review URL: https://codereview.chromium.org/24114002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222589 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/gpu/gpu_main.cc2
1 files changed, 0 insertions, 2 deletions
diff --git a/content/gpu/gpu_main.cc b/content/gpu/gpu_main.cc
index 9e29e03..da063d8 100644
--- a/content/gpu/gpu_main.cc
+++ b/content/gpu/gpu_main.cc
@@ -146,8 +146,6 @@ 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