OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/command_line.h" | 5 #include "base/command_line.h" |
6 #include "base/file_util.h" | 6 #include "base/file_util.h" |
7 #include "base/memory/scoped_ptr.h" | 7 #include "base/memory/scoped_ptr.h" |
8 #include "base/path_service.h" | 8 #include "base/path_service.h" |
9 #include "base/test/trace_event_analyzer.h" | 9 #include "base/test/trace_event_analyzer.h" |
10 #include "base/version.h" | 10 #include "base/version.h" |
(...skipping 172 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
183 EXPECT_EQ( | 183 EXPECT_EQ( |
184 flags.flags(), | 184 flags.flags(), |
185 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl)); | 185 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureWebgl)); |
186 | 186 |
187 const FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); | 187 const FilePath url(FILE_PATH_LITERAL("feature_webgl.html")); |
188 RunTest(url, EXPECT_NO_GPU_PROCESS); | 188 RunTest(url, EXPECT_NO_GPU_PROCESS); |
189 } | 189 } |
190 | 190 |
191 #if defined(OS_LINUX) | 191 #if defined(OS_LINUX) |
192 // http://crbug.com/104142 | 192 // http://crbug.com/104142 |
193 #define Canvas2DAllowed FLAKY_Canvas2DAllowed | 193 #define Canvas2DAllowed DISABLED_Canvas2DAllowed |
194 #endif | 194 #endif |
195 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { | 195 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, Canvas2DAllowed) { |
196 GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags(); | 196 GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags(); |
197 EXPECT_EQ(flags.flags(), 0u); | 197 EXPECT_EQ(flags.flags(), 0u); |
198 | 198 |
199 num_contexts_ = 2; | 199 num_contexts_ = 2; |
200 const GpuResultFlags expectations = EXPECT_GPU_PROCESS | | 200 const GpuResultFlags expectations = EXPECT_GPU_PROCESS | |
201 EXPECT_GPU_SWAP_BUFFERS | | 201 EXPECT_GPU_SWAP_BUFFERS | |
202 EXPECT_GPU_CONTEXTS; | 202 EXPECT_GPU_CONTEXTS; |
203 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); | 203 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); |
(...skipping 19 matching lines...) Expand all Loading... |
223 EXPECT_EQ( | 223 EXPECT_EQ( |
224 flags.flags(), | 224 flags.flags(), |
225 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas)); | 225 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas)); |
226 | 226 |
227 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); | 227 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); |
228 RunTest(url, EXPECT_NO_GPU_PROCESS); | 228 RunTest(url, EXPECT_NO_GPU_PROCESS); |
229 } | 229 } |
230 | 230 |
231 } // namespace anonymous | 231 } // namespace anonymous |
232 | 232 |
OLD | NEW |