diff options
| author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 01:49:29 +0000 |
|---|---|---|
| committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-12 01:49:29 +0000 |
| commit | 5d29876e8b15523be7e650200ecad6fcec677b3c (patch) | |
| tree | 0eb943b67279c466eb21fb39285b31de4b486fab /content/gpu/gpu_main.cc | |
| parent | 9ebe879063d309fde2a7a8f1576f8d71aac7404d (diff) | |
| download | chromium_src-5d29876e8b15523be7e650200ecad6fcec677b3c.zip chromium_src-5d29876e8b15523be7e650200ecad6fcec677b3c.tar.gz chromium_src-5d29876e8b15523be7e650200ecad6fcec677b3c.tar.bz2 | |
Revert 222689 "Use an X event loop in the GPU process on Linux."
> 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.
>
> Update package dependencies.
>
> BUG=145600
> TBR=thakis, piman
>
> Review URL: https://chromiumcodereview.appspot.com/23710029
Broke nacl-sizes:
PERF_REGRESS: nacl_helper-text/text (0.11%), nacl_helper-text/text (0.11%)
http://build.chromium.org/p/chromium/buildstatus?builder=Linux%20x64&number=55508
Please add a suppression or remove the inclusion from nacl_helper.
TBR=ccameron@chromium.org
Review URL: https://codereview.chromium.org/23620042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222694 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/gpu/gpu_main.cc')
| -rw-r--r-- | content/gpu/gpu_main.cc | 2 |
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 |