diff options
| author | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 21:21:48 +0000 |
|---|---|---|
| committer | apatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-22 21:21:48 +0000 |
| commit | 351b6592239ee36d7f218396c1bd84514fd35a59 (patch) | |
| tree | 919172b47fb6eaf9bc0e2679e04e911727ba55d0 | |
| parent | 4f4944de169927bb5edf8927b1f0a8bfc96d464b (diff) | |
| download | chromium_src-351b6592239ee36d7f218396c1bd84514fd35a59.zip chromium_src-351b6592239ee36d7f218396c1bd84514fd35a59.tar.gz chromium_src-351b6592239ee36d7f218396c1bd84514fd35a59.tar.bz2 | |
Pepper3D plugin tests enabled for Windows.
OSMesa (offscreen 3D renderer) allows us to now run these on the bots. Once OSMesa is working on linux and max, we can enable the tests for those platforms too.
TEST=trybots, checked they fail when OSMesa is not built and pass when OSMesa is built
BUG=none
Review URL: http://codereview.chromium.org/1752006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@45353 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | app/gfx/gl/gl_context_win.cc | 4 | ||||
| -rw-r--r-- | chrome/test/ui/pepper_uitest.cc | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/app/gfx/gl/gl_context_win.cc b/app/gfx/gl/gl_context_win.cc index b3a8243..0f4d570 100644 --- a/app/gfx/gl/gl_context_win.cc +++ b/app/gfx/gl/gl_context_win.cc @@ -411,6 +411,10 @@ void OSMesaViewGLContext::Destroy() { } bool OSMesaViewGLContext::MakeCurrent() { + // TODO(apatrick): This is a bit of a hack. The window might have had zero + // size when the context was initialized. Assume it has a valid size when + // MakeCurrent is called and resize the back buffer if necessary. + UpdateSize(); return osmesa_context_.MakeCurrent(); } diff --git a/chrome/test/ui/pepper_uitest.cc b/chrome/test/ui/pepper_uitest.cc index b91877b..5810467 100644 --- a/chrome/test/ui/pepper_uitest.cc +++ b/chrome/test/ui/pepper_uitest.cc @@ -35,7 +35,8 @@ class PepperTester : public NPAPITesterBase { // Test that a pepper 3d plugin loads and renders. // TODO(alokp): Enable the test after making sure it works on all platforms // and buildbots have OpenGL support. -TEST_F(PepperTester, DISABLED_Pepper3D) { +#if defined(OS_WIN) +TEST_F(PepperTester, Pepper3D) { const FilePath dir(FILE_PATH_LITERAL("pepper")); const FilePath file(FILE_PATH_LITERAL("pepper_3d.html")); GURL url = ui_test_utils::GetTestUrl(dir, file); @@ -44,3 +45,4 @@ TEST_F(PepperTester, DISABLED_Pepper3D) { kTestCompleteCookie, kTestCompleteSuccess, action_max_timeout_ms()); } +#endif |