| 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 95 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 &events); | 106 &events); |
| 107 EXPECT_GT(events.size(), size_t(0)); | 107 EXPECT_GT(events.size(), size_t(0)); |
| 108 } | 108 } |
| 109 } | 109 } |
| 110 | 110 |
| 111 protected: | 111 protected: |
| 112 size_t num_contexts_; | 112 size_t num_contexts_; |
| 113 size_t num_offscreen_contexts_; | 113 size_t num_offscreen_contexts_; |
| 114 }; | 114 }; |
| 115 | 115 |
| 116 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingAllowed) { | 116 #if defined(OS_CHROMEOS) |
| 117 // http://crbug.com/106259 |
| 118 #define MAYBE_AcceleratedCompositingAllowed DISABLED_testSetBooleanPrefTriggers |
| 119 #else |
| 120 #define MAYBE_AcceleratedCompositingAllowed AcceleratedCompositingAllowed |
| 121 #endif |
| 122 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, MAYBE_AcceleratedCompositingAllowed) { |
| 117 GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags(); | 123 GpuFeatureFlags flags = GpuDataManager::GetInstance()->GetGpuFeatureFlags(); |
| 118 EXPECT_EQ(flags.flags(), 0u); | 124 EXPECT_EQ(flags.flags(), 0u); |
| 119 | 125 |
| 120 num_contexts_ = 1; | 126 num_contexts_ = 1; |
| 121 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); | 127 const FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); |
| 122 RunTest(url, EXPECT_GPU_PROCESS | EXPECT_GPU_SWAP_BUFFERS | | 128 RunTest(url, EXPECT_GPU_PROCESS | EXPECT_GPU_SWAP_BUFFERS | |
| 123 EXPECT_GPU_CONTEXTS); | 129 EXPECT_GPU_CONTEXTS); |
| 124 } | 130 } |
| 125 | 131 |
| 126 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingBlocked) { | 132 IN_PROC_BROWSER_TEST_F(GpuFeatureTest, AcceleratedCompositingBlocked) { |
| (...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 221 EXPECT_EQ( | 227 EXPECT_EQ( |
| 222 flags.flags(), | 228 flags.flags(), |
| 223 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas)); | 229 static_cast<uint32>(GpuFeatureFlags::kGpuFeatureAccelerated2dCanvas)); |
| 224 | 230 |
| 225 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); | 231 const FilePath url(FILE_PATH_LITERAL("feature_canvas2d.html")); |
| 226 RunTest(url, EXPECT_NO_GPU_PROCESS); | 232 RunTest(url, EXPECT_NO_GPU_PROCESS); |
| 227 } | 233 } |
| 228 | 234 |
| 229 } // namespace anonymous | 235 } // namespace anonymous |
| 230 | 236 |
| OLD | NEW |