Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(424)

Side by Side Diff: gpu/command_buffer/tests/gl_tests_main.cc

Issue 234533002: Remove a bunch of TOOLKIT_GTK in content/ and gpu/, as well as NPAPI plugins on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, skip changing browser_main_loop.cc because of presubmit issues, will follow up Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « content/test/test_render_view_host.cc ('k') | gpu/gles2_conform_support/native/main.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/at_exit.h" 5 #include "base/at_exit.h"
6 #include "base/command_line.h" 6 #include "base/command_line.h"
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #if defined(OS_MACOSX) 8 #if defined(OS_MACOSX)
9 #include "base/mac/scoped_nsautorelease_pool.h" 9 #include "base/mac/scoped_nsautorelease_pool.h"
10 #endif 10 #endif
11 #include "gpu/command_buffer/client/gles2_lib.h" 11 #include "gpu/command_buffer/client/gles2_lib.h"
12 #include "gpu/command_buffer/tests/gl_test_utils.h" 12 #include "gpu/command_buffer/tests/gl_test_utils.h"
13 #include "gpu/config/gpu_util.h" 13 #include "gpu/config/gpu_util.h"
14 #include "ui/gl/gl_surface.h" 14 #include "ui/gl/gl_surface.h"
15 15
16 #if defined(OS_ANDROID) 16 #if defined(OS_ANDROID)
17 #include "base/android/jni_android.h" 17 #include "base/android/jni_android.h"
18 #include "ui/gl/android/gl_jni_registrar.h" 18 #include "ui/gl/android/gl_jni_registrar.h"
19 #endif 19 #endif
20 20
21 #if defined(TOOLKIT_GTK)
22 #include "ui/gfx/gtk_util.h"
23 #endif
24
25 int main(int argc, char** argv) { 21 int main(int argc, char** argv) {
26 #if defined(OS_ANDROID) 22 #if defined(OS_ANDROID)
27 ui::gl::android::RegisterJni(base::android::AttachCurrentThread()); 23 ui::gl::android::RegisterJni(base::android::AttachCurrentThread());
28 #else 24 #else
29 base::AtExitManager exit_manager; 25 base::AtExitManager exit_manager;
30 #endif 26 #endif
31 CommandLine::Init(argc, argv); 27 CommandLine::Init(argc, argv);
32 #if defined(OS_MACOSX) 28 #if defined(OS_MACOSX)
33 base::mac::ScopedNSAutoreleasePool pool; 29 base::mac::ScopedNSAutoreleasePool pool;
34 #endif 30 #endif
35 #if defined(TOOLKIT_GTK)
36 gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
37 #endif
38 gfx::GLSurface::InitializeOneOff(); 31 gfx::GLSurface::InitializeOneOff();
39 ::gles2::Initialize(); 32 ::gles2::Initialize();
40 gpu::ApplyGpuDriverBugWorkarounds(CommandLine::ForCurrentProcess()); 33 gpu::ApplyGpuDriverBugWorkarounds(CommandLine::ForCurrentProcess());
41 base::MessageLoop main_message_loop; 34 base::MessageLoop main_message_loop;
42 return GLTestHelper::RunTests(argc, argv); 35 return GLTestHelper::RunTests(argc, argv);
43 } 36 }
44 37
45 38
OLDNEW
« no previous file with comments | « content/test/test_render_view_host.cc ('k') | gpu/gles2_conform_support/native/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698