| 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/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/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
| 10 #include "base/test/trace_event_analyzer.h" | 10 #include "base/test/trace_event_analyzer.h" |
| (...skipping 219 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 230 } | 230 } |
| 231 | 231 |
| 232 class AcceleratedCompositingTest : public GpuFeatureTest { | 232 class AcceleratedCompositingTest : public GpuFeatureTest { |
| 233 public: | 233 public: |
| 234 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 234 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
| 235 GpuFeatureTest::SetUpCommandLine(command_line); | 235 GpuFeatureTest::SetUpCommandLine(command_line); |
| 236 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); | 236 command_line->AppendSwitch(switches::kDisableAcceleratedCompositing); |
| 237 } | 237 } |
| 238 }; | 238 }; |
| 239 | 239 |
| 240 #if defined(OS_WIN) && defined(USE_AURA) | 240 #if defined(USE_AURA) |
| 241 // Compositing is always on for Windows Aura. | 241 // Compositing is always on for Aura. |
| 242 #define MAYBE_AcceleratedCompositingDisabled DISABLED_AcceleratedCompositingDisa
bled | 242 #define MAYBE_AcceleratedCompositingDisabled DISABLED_AcceleratedCompositingDisa
bled |
| 243 #else | 243 #else |
| 244 #define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled | 244 #define MAYBE_AcceleratedCompositingDisabled AcceleratedCompositingDisabled |
| 245 #endif | 245 #endif |
| 246 | 246 |
| 247 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest, | 247 IN_PROC_BROWSER_TEST_F(AcceleratedCompositingTest, |
| 248 MAYBE_AcceleratedCompositingDisabled) { | 248 MAYBE_AcceleratedCompositingDisabled) { |
| 249 // Compositing is always on for Windows Aura. | 249 // Compositing is always on for Windows Aura. |
| 250 const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); | 250 const base::FilePath url(FILE_PATH_LITERAL("feature_compositing.html")); |
| 251 RunEventTest(url, kSwapBuffersEvent, false); | 251 RunEventTest(url, kSwapBuffersEvent, false); |
| (...skipping 300 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 552 base::StringPrintf( | 552 base::StringPrintf( |
| 553 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " | 553 "%d (resize offset %d): IOSurface width %d -> %d; Creates %d " |
| 554 "Expected %d", offset_i, offsets[offset_i], | 554 "Expected %d", offset_i, offsets[offset_i], |
| 555 old_width, new_width, num_creates, expected_creates); | 555 old_width, new_width, num_creates, expected_creates); |
| 556 } | 556 } |
| 557 } | 557 } |
| 558 } | 558 } |
| 559 #endif | 559 #endif |
| 560 | 560 |
| 561 } // namespace anonymous | 561 } // namespace anonymous |
| OLD | NEW |