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

Unified Diff: chrome/test/gpu/gpu_feature_browsertest.cc

Issue 9509001: Add basic threaded compositor test to gpu_feature_browsertest.cc (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: disabling because of assertion Created 8 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/test/data/gpu/feature_compositing.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/gpu/gpu_feature_browsertest.cc
diff --git a/chrome/test/gpu/gpu_feature_browsertest.cc b/chrome/test/gpu/gpu_feature_browsertest.cc
index 09fc1e24dcbe1f410b071dc952df928b44407cdf..707f199c51c5488bc14a2b864f2196e5a977e9ce 100644
--- a/chrome/test/gpu/gpu_feature_browsertest.cc
+++ b/chrome/test/gpu/gpu_feature_browsertest.cc
@@ -11,6 +11,7 @@
#include "chrome/browser/gpu_blacklist.h"
#include "chrome/browser/ui/browser.h"
#include "chrome/common/chrome_paths.h"
+#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/in_process_browser_test.h"
#include "chrome/test/base/test_launcher_utils.h"
#include "chrome/test/base/tracing.h"
@@ -55,6 +56,7 @@ class GpuFeatureTest : public InProcessBrowserTest {
#endif
}
command_line->AppendSwitch(switches::kDisablePopupBlocking);
+ command_line->AppendSwitchASCII(switches::kWindowSize, "400,300");
}
void SetupBlacklist(const std::string& json_blacklist) {
@@ -323,5 +325,18 @@ IN_PROC_BROWSER_TEST_F(GpuFeatureTest, CanOpenPopupAndRenderWith2DCanvas) {
RunTest(url, "\"SUCCESS\"", false);
}
+class ThreadedCompositorTest : public GpuFeatureTest {
+ public:
+ virtual void SetUpCommandLine(CommandLine* command_line) {
+ GpuFeatureTest::SetUpCommandLine(command_line);
+ command_line->AppendSwitch(switches::kEnableThreadedCompositing);
+ }
+};
+
+IN_PROC_BROWSER_TEST_F(ThreadedCompositorTest, DISABLED_ThreadedCompositor) {
+ const FilePath url(FILE_PATH_LITERAL("feature_compositing.html"));
+ RunTest(url, EXPECT_GPU_SWAP_BUFFERS);
+}
+
} // namespace anonymous
« no previous file with comments | « chrome/test/data/gpu/feature_compositing.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698