Chromium Code Reviews

Side by Side Diff: webkit/tools/test_shell/test_shell.h

Issue 3440029: test_shell command line switch enable-accelerated-compositing added (Closed)
Patch Set: Created 10 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « no previous file | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved. 2 * Copyright (C) 2006 Apple Computer, Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 261 matching lines...)
272 // The returned string is the ASCII-ized MD5 sum of the image. 272 // The returned string is the ASCII-ized MD5 sum of the image.
273 static std::string DumpImage(skia::PlatformCanvas* canvas, 273 static std::string DumpImage(skia::PlatformCanvas* canvas,
274 const FilePath& path, 274 const FilePath& path,
275 const std::string& pixel_hash); 275 const std::string& pixel_hash);
276 276
277 static void ResetWebPreferences(); 277 static void ResetWebPreferences();
278 278
279 static void SetAllowScriptsToCloseWindows(); 279 static void SetAllowScriptsToCloseWindows();
280 280
281 static void SetAccelerated2dCanvasEnabled(bool enabled); 281 static void SetAccelerated2dCanvasEnabled(bool enabled);
282 static void SetAcceleratedCompositingEnabled(bool enabled);
282 283
283 WebPreferences* GetWebPreferences() { return web_prefs_; } 284 WebPreferences* GetWebPreferences() { return web_prefs_; }
284 285
285 // Some layout tests hardcode a file:///tmp/LayoutTests URL. We get around 286 // Some layout tests hardcode a file:///tmp/LayoutTests URL. We get around
286 // this by substituting "tmp" with the path to the LayoutTests parent dir. 287 // this by substituting "tmp" with the path to the LayoutTests parent dir.
287 static std::string RewriteLocalUrl(const std::string& url); 288 static std::string RewriteLocalUrl(const std::string& url);
288 289
289 // Set the timeout for running a test. 290 // Set the timeout for running a test.
290 static void SetFileTestTimeout(int timeout_ms) { 291 static void SetFileTestTimeout(int timeout_ms) {
291 file_test_timeout_ms_ = timeout_ms; 292 file_test_timeout_ms_ = timeout_ms;
(...skipping 138 matching lines...)
430 431
431 // True while a test is preparing to run 432 // True while a test is preparing to run
432 static bool test_is_preparing_; 433 static bool test_is_preparing_;
433 434
434 // True while a test is running 435 // True while a test is running
435 static bool test_is_pending_; 436 static bool test_is_pending_;
436 437
437 // True if we're testing the accelerated canvas 2d path. 438 // True if we're testing the accelerated canvas 2d path.
438 static bool accelerated_2d_canvas_enabled_; 439 static bool accelerated_2d_canvas_enabled_;
439 440
441 // True if we're testing the accelerated compositing.
442 static bool accelerated_compositing_enabled_;
443
440 // True if driven from a nested message loop. 444 // True if driven from a nested message loop.
441 bool is_modal_; 445 bool is_modal_;
442 446
443 // True if the page is loading. 447 // True if the page is loading.
444 bool is_loading_; 448 bool is_loading_;
445 449
446 bool allow_images_; 450 bool allow_images_;
447 bool allow_plugins_; 451 bool allow_plugins_;
448 bool allow_scripts_; 452 bool allow_scripts_;
449 453
450 // The preferences for the test shell. 454 // The preferences for the test shell.
451 static WebPreferences* web_prefs_; 455 static WebPreferences* web_prefs_;
452 456
453 #if defined(OS_WIN) 457 #if defined(OS_WIN)
454 // Used by the watchdog to know when it's finished. 458 // Used by the watchdog to know when it's finished.
455 HANDLE finished_event_; 459 HANDLE finished_event_;
456 #endif 460 #endif
457 461
458 // Dump the stats table counters on exit. 462 // Dump the stats table counters on exit.
459 bool dump_stats_table_on_exit_; 463 bool dump_stats_table_on_exit_;
460 }; 464 };
461 465
462 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_ 466 #endif // WEBKIT_TOOLS_TEST_SHELL_TEST_SHELL_H_
OLDNEW
« no previous file with comments | « no previous file | webkit/tools/test_shell/test_shell.cc » ('j') | no next file with comments »

Powered by Google App Engine