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

Side by Side Diff: content/common/gpu/client/gl_helper_unittest.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/common/cursors/webcursor_unittest.cc ('k') | content/common/plugin_process_messages.h » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 <stdio.h> 5 #include <stdio.h>
6 #include <cmath> 6 #include <cmath>
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include <GLES2/gl2.h> 10 #include <GLES2/gl2.h>
(...skipping 21 matching lines...) Expand all
32 #include "testing/gtest/include/gtest/gtest.h" 32 #include "testing/gtest/include/gtest/gtest.h"
33 #include "third_party/skia/include/core/SkBitmap.h" 33 #include "third_party/skia/include/core/SkBitmap.h"
34 #include "third_party/skia/include/core/SkTypes.h" 34 #include "third_party/skia/include/core/SkTypes.h"
35 #include "ui/gl/gl_implementation.h" 35 #include "ui/gl/gl_implementation.h"
36 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h" 36 #include "webkit/common/gpu/webgraphicscontext3d_in_process_command_buffer_impl. h"
37 37
38 #if defined(OS_MACOSX) 38 #if defined(OS_MACOSX)
39 #include "base/mac/scoped_nsautorelease_pool.h" 39 #include "base/mac/scoped_nsautorelease_pool.h"
40 #endif 40 #endif
41 41
42 #if defined(TOOLKIT_GTK)
43 #include "ui/gfx/gtk_util.h"
44 #endif
45
46 namespace content { 42 namespace content {
47 43
48 using blink::WebGLId; 44 using blink::WebGLId;
49 using blink::WebGraphicsContext3D; 45 using blink::WebGraphicsContext3D;
50 using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl; 46 using webkit::gpu::WebGraphicsContext3DInProcessCommandBufferImpl;
51 47
52 content::GLHelper::ScalerQuality kQualities[] = { 48 content::GLHelper::ScalerQuality kQualities[] = {
53 content::GLHelper::SCALER_QUALITY_BEST, 49 content::GLHelper::SCALER_QUALITY_BEST,
54 content::GLHelper::SCALER_QUALITY_GOOD, 50 content::GLHelper::SCALER_QUALITY_GOOD,
55 content::GLHelper::SCALER_QUALITY_FAST, }; 51 content::GLHelper::SCALER_QUALITY_FAST, };
(...skipping 1608 matching lines...) Expand 10 before | Expand all | Expand 10 after
1664 } // namespace 1660 } // namespace
1665 1661
1666 // These tests needs to run against a proper GL environment, so we 1662 // These tests needs to run against a proper GL environment, so we
1667 // need to set it up before we can run the tests. 1663 // need to set it up before we can run the tests.
1668 int main(int argc, char** argv) { 1664 int main(int argc, char** argv) {
1669 CommandLine::Init(argc, argv); 1665 CommandLine::Init(argc, argv);
1670 base::TestSuite* suite = new content::ContentTestSuite(argc, argv); 1666 base::TestSuite* suite = new content::ContentTestSuite(argc, argv);
1671 #if defined(OS_MACOSX) 1667 #if defined(OS_MACOSX)
1672 base::mac::ScopedNSAutoreleasePool pool; 1668 base::mac::ScopedNSAutoreleasePool pool;
1673 #endif 1669 #endif
1674 #if defined(TOOLKIT_GTK)
1675 gfx::GtkInitFromCommandLine(*CommandLine::ForCurrentProcess());
1676 #endif
1677 gpu::ApplyGpuDriverBugWorkarounds(CommandLine::ForCurrentProcess()); 1670 gpu::ApplyGpuDriverBugWorkarounds(CommandLine::ForCurrentProcess());
1678 1671
1679 content::UnitTestTestSuite runner(suite); 1672 content::UnitTestTestSuite runner(suite);
1680 base::MessageLoop message_loop; 1673 base::MessageLoop message_loop;
1681 return runner.Run(); 1674 return runner.Run();
1682 } 1675 }
OLDNEW
« no previous file with comments | « content/common/cursors/webcursor_unittest.cc ('k') | content/common/plugin_process_messages.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698