commit 4119ed3da1d8ce73235a7e05e5aa3c4477ea8d5e
author Jamie Madill <jmadill@chromium.org> Wed Oct 01 10:41:40 2014 -0400
committer Jamie Madill <jmadill@chromium.org> Thu Oct 09 20:32:31 2014 +0000
tree b82250e3dde0c6c7117c337674ddb5ddddf8c832
parent 91f2911f70cef60d0338443cc47ee6544a0781db

Make OSWindow a non-static member of ANGLETest.

BUG=angle:611

Change-Id: I455e1dd0ad5582191621e316c4808a2d753e9aaa
Reviewed-on: https://chromium-review.googlesource.com/219867
Tested-by: Jamie Madill <jmadill@chromium.org>
Reviewed-by: Geoff Lang <geofflang@chromium.org>

tests/angle_tests/ANGLETest.cpp

diff --git a/tests/angle_tests/ANGLETest.cpp b/tests/angle_tests/ANGLETest.cpp
index b24e792..9c3d52b 100644
--- a/tests/angle_tests/ANGLETest.cpp
+++ b/tests/angle_tests/ANGLETest.cpp
@@ -2,31 +2,25 @@
 #include "EGLWindow.h"
 #include "OSWindow.h"
 
-OSWindow *ANGLETest::mOSWindow = NULL;
-
 ANGLETest::ANGLETest(EGLint glesMajorVersion, EGLint requestedRenderer)
     : mEGLWindow(NULL),
-      mRequestedRenderer(requestedRenderer)
+      mOSWindow(NULL)
 {
     mEGLWindow = new EGLWindow(1280, 720, glesMajorVersion, requestedRenderer);
 }
 
 void ANGLETest::SetUp()
 {
-    // As per the spec for ANGLE_platform_angle, the value of EGL_PLATFORM_ANGLE_TYPE_ANGLE is ignored if an EGLDisplay
-    // was previously created for any value of EGLNativeDisplayType.
-    // As a result, if we wish to request a different display type then we need to recreate the OS Window.
-    if (mOSWindow->getRequestedRenderer() != EGL_NONE && mOSWindow->getRequestedRenderer() != mRequestedRenderer)
+    if (!initTestWindow())
     {
-        ANGLETest::DestroyTestWindow();
-
-        if (!ANGLETest::InitTestWindow())
-        {
-            FAIL() << "Failed to create ANGLE test window.";
-        }
+        FAIL() << "Failed to create ANGLE test window.";
     }
 
-    ResizeWindow(mEGLWindow->getWidth(), mEGLWindow->getHeight());
+    if (!resizeWindow(mEGLWindow->getWidth(), mEGLWindow->getHeight()))
+    {
+        FAIL() << "Failed to resize ANGLE test window.";
+    }
+
     if (!createEGLContext())
     {
         FAIL() << "egl context creation failed.";
@@ -52,6 +46,11 @@
             exit(0);
         }
     }
+
+    if (!destroyTestWindow())
+    {
+        FAIL() << "ANGLE test window destruction failed.";
+    }
 }
 
 void ANGLETest::swapBuffers()
@@ -197,7 +196,7 @@
     return true;
 }
 
-bool ANGLETest::InitTestWindow()
+bool ANGLETest::initTestWindow()
 {
     mOSWindow = CreateOSWindow();
     if (!mOSWindow->initialize("ANGLE_TEST", 128, 128))
@@ -205,12 +204,12 @@
         return false;
     }
 
-    mOSWindow->setVisible(true);
+    mOSWindow->setVisible(false);
 
     return true;
 }
 
-bool ANGLETest::DestroyTestWindow()
+bool ANGLETest::destroyTestWindow()
 {
     if (mOSWindow)
     {
@@ -222,20 +221,12 @@
     return true;
 }
 
-bool ANGLETest::ResizeWindow(int width, int height)
+bool ANGLETest::resizeWindow(int width, int height)
 {
     return mOSWindow->resize(width, height);
 }
 
-void ANGLETestEnvironment::SetUp()
+void ANGLETest::setWindowVisible(bool isVisible)
 {
-    if (!ANGLETest::InitTestWindow())
-    {
-        FAIL() << "Failed to create ANGLE test window.";
-    }
-}
-
-void ANGLETestEnvironment::TearDown()
-{
-    ANGLETest::DestroyTestWindow();
+    mOSWindow->setVisible(isVisible);
 }