Revert "ANGLETest::SetUp: resize the window only if needed."

src/tests/test_utils/ANGLETest.cpp

@@ -17,28 +17,25 @@ ANGLETest::~ANGLETest()
 
 void ANGLETest::SetUp()
 {
-    if (!createEGLContext())
+    if (!ResizeWindow(mWidth, mHeight))
     {
-        FAIL() << "egl context creation failed.";
+        FAIL() << "Failed to resize ANGLE test window.";
     }
 
-    if (mOSWindow->getWidth() != mWidth || mOSWindow->getHeight() != mHeight)
+    if (!createEGLContext())
     {
-        if (!mOSWindow->resize(mWidth, mHeight))
-        {
-            FAIL() << "Failed to resize ANGLE test window.";
-        }
+        FAIL() << "egl context creation failed.";
+    }
 
-        // Swap the buffers so that the default framebuffer picks up the resize
-        // which will allow follow-up test code to assume the framebuffer covers
-        // the whole window.
-        swapBuffers();
+    // Swap the buffers so that the default framebuffer picks up the resize
+    // which will allow follow-up test code to assume the framebuffer covers
+    // the whole window.
+    swapBuffers();
 
-        // This Viewport command is not strictly necessary but we add it so that programs
-        // taking OpenGL traces can guess the size of the default framebuffer and show it
-        // in their UIs
-        glViewport(0, 0, mWidth, mHeight);
-    }
+    // This Viewport command is not strictly necessary but we add it so that programs
+    // taking OpenGL traces can guess the size of the default framebuffer and show it
+    // in their UIs
+    glViewport(0, 0, mWidth, mHeight);
 }
 
 void ANGLETest::TearDown()
@@ -253,6 +250,11 @@ bool ANGLETest::DestroyTestWindow()
     return true;
 }
 
+bool ANGLETest::ResizeWindow(int width, int height)
+{
+    return mOSWindow->resize(width, height);
+}
+
 void ANGLETest::SetWindowVisible(bool isVisible)
 {
     mOSWindow->setVisible(isVisible);

src/tests/test_utils/ANGLETest.h

@@ -67,6 +67,7 @@ class ANGLETest : public ::testing::TestWithParam<angle::PlatformParameters>
   public:
     static bool InitTestWindow();
     static bool DestroyTestWindow();
+    static bool ResizeWindow(int width, int height);
     static void SetWindowVisible(bool isVisible);
 
   protected: