| OLD | NEW |
| 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 "ui/gl/gl_surface.h" | 11 #include "ui/gl/gl_surface.h" |
| 12 | 12 |
| 13 #if defined(TOOLKIT_GTK) | |
| 14 #include "ui/gfx/gtk_util.h" | |
| 15 #endif | |
| 16 | |
| 17 extern "C" { | 13 extern "C" { |
| 18 #if defined(GLES2_CONFORM_SUPPORT_ONLY) | 14 #if defined(GLES2_CONFORM_SUPPORT_ONLY) |
| 19 #include "gpu/gles2_conform_support/gtf/gtf_stubs.h" | 15 #include "gpu/gles2_conform_support/gtf/gtf_stubs.h" |
| 20 #else | 16 #else |
| 21 #include "third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFMain.h" | 17 #include "third_party/gles2_conform/GTF_ES/glsl/GTF/Source/GTFMain.h" |
| 22 #endif | 18 #endif |
| 23 } | 19 } |
| 24 | 20 |
| 25 int main(int argc, char *argv[]) { | 21 int main(int argc, char *argv[]) { |
| 26 base::AtExitManager at_exit; | 22 base::AtExitManager at_exit; |
| 27 CommandLine::Init(argc, argv); | 23 CommandLine::Init(argc, argv); |
| 28 base::MessageLoopForUI message_loop; | 24 base::MessageLoopForUI message_loop; |
| 29 | 25 |
| 30 #if defined(OS_MACOSX) | 26 #if defined(OS_MACOSX) |
| 31 base::mac::ScopedNSAutoreleasePool pool; | 27 base::mac::ScopedNSAutoreleasePool pool; |
| 32 #endif | 28 #endif |
| 33 #if defined(TOOLKIT_GTK) | |
| 34 gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess()); | |
| 35 #endif | |
| 36 | |
| 37 GTFMain(argc, argv); | 29 GTFMain(argc, argv); |
| 38 | 30 |
| 39 return 0; | 31 return 0; |
| 40 } | 32 } |
| 41 | 33 |
| OLD | NEW |