summaryrefslogtreecommitdiffstats
path: root/content/browser/gpu/gpu_memory_test.cc
diff options
context:
space:
mode:
authorccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-29 20:34:39 +0000
committerccameron@chromium.org <ccameron@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-01-29 20:34:39 +0000
commit31fd45304980586150e015e9c78639dcac81700d (patch)
tree7507df5f0edfc0d355e35ffb61aca4102f05a309 /content/browser/gpu/gpu_memory_test.cc
parentc39987966e89f78b59c53bf87aedacacd134b87b (diff)
downloadchromium_src-31fd45304980586150e015e9c78639dcac81700d.zip
chromium_src-31fd45304980586150e015e9c78639dcac81700d.tar.gz
chromium_src-31fd45304980586150e015e9c78639dcac81700d.tar.bz2
Don't use preserve-3d in GpuMemoryTest.
Using preserve-3d hits an O(n^2) sort, which makes the test time-out on Windows debug builds. A Windows debug build now runs in about 3 seconds. TBR=ccameron BUG=171512 Review URL: https://codereview.chromium.org/12089055 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@179403 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/gpu/gpu_memory_test.cc')
-rw-r--r--content/browser/gpu/gpu_memory_test.cc4
1 files changed, 0 insertions, 4 deletions
diff --git a/content/browser/gpu/gpu_memory_test.cc b/content/browser/gpu/gpu_memory_test.cc
index d8d8610..fc62846 100644
--- a/content/browser/gpu/gpu_memory_test.cc
+++ b/content/browser/gpu/gpu_memory_test.cc
@@ -235,10 +235,6 @@ IN_PROC_BROWSER_TEST_F(GpuMemoryTest, SingleWindowDoesNotExceedLimit) {
if (!AllowTestsToRun())
return;
- // crbug.com/171512, timeout on Win Debug.
- if (GPUTestBotConfig::CurrentConfigMatches("WIN DEBUG"))
- return;
-
content::Shell* tab = CreateNewTab();
LoadPage(tab, PAGE_CSS3D, kMemoryLimitMB);
// Make sure that the CSS3D page maxes out a single tab's budget (otherwise