From 818c8554ec0fc9688690c1c29cbf713268e33568 Mon Sep 17 00:00:00 2001 From: "danakj@chromium.org" Date: Thu, 30 Jan 2014 22:05:37 +0000 Subject: Ensure GL initialization only happens once, and provide common init path Currently tests initialize GL by calling into methods that should be internal to the gl bindings code. Instead, everyone should go through GLSurface::InitializeOneOff. Also GLSurface::InitializeOneOff early outs if it was already called, leading to a pattern of initializing GL all over the place just in case and not having a clear idea of where it should be set up. Instead, DCHECK that it is not called more than once, and move calls to this method to be during process startup for unit test suites instead of mid-test. This adds two test variants of InitializeOneOff for tests to call, that set up OSMesa or Mock GL bindings, via GLSurface::InitializeOneOff. R=piman, sievers BUG=270918 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=247793 Review URL: https://codereview.chromium.org/135213003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@248049 0039d316-1c4b-4281-b951-d872f2087c98 --- cc/test/pixel_test.cc | 3 --- 1 file changed, 3 deletions(-) (limited to 'cc/test/pixel_test.cc') diff --git a/cc/test/pixel_test.cc b/cc/test/pixel_test.cc index e84540e..38a2b54 100644 --- a/cc/test/pixel_test.cc +++ b/cc/test/pixel_test.cc @@ -23,7 +23,6 @@ #include "cc/test/pixel_test_utils.h" #include "cc/test/test_in_process_context_provider.h" #include "testing/gtest/include/gtest/gtest.h" -#include "ui/gl/gl_implementation.h" namespace cc { @@ -118,8 +117,6 @@ bool PixelTest::PixelsMatchReference(const base::FilePath& ref_file, } void PixelTest::SetUpGLRenderer(bool use_skia_gpu_backend) { - CHECK(gfx::InitializeStaticGLBindings(gfx::kGLImplementationOSMesaGL)); - output_surface_.reset( new PixelTestOutputSurface(new TestInProcessContextProvider)); output_surface_->BindToClient(output_surface_client_.get()); -- cgit v1.1